asuc-octo / berkeley-mobile-android

The danker-than-iOS Berkeley Mobile app [Outdated]
Other
10 stars 3 forks source link

Fix merge 9.0 #142

Closed rustielin closed 5 years ago

rustielin commented 5 years ago

A huge merge conflict from develop --> master, so created a separate PR for this, since we can't commit directly to develop anyways. Testing needed~

Some backend data still malformed, but we do a good job at handling it in a fail-safe way.