lemberg / connfa-android

Open Source Android app for Conferences and Events
http://connfa.com
Apache License 2.0
100 stars 111 forks source link

Merge in working branch to develop #12

Closed rock3r closed 7 years ago

rock3r commented 7 years ago

The PR from develop on mainline has been merged, we can move in our temporary branch to our develop (yeah, I had messed up there)

rock3r commented 7 years ago

Sorry, I have been tricked by Github once again :( Was meant to be against our own develop.