AndyScherzinger de8bb6a691 Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom ... # Conflicts: # src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java		2017-06-05 00:38:52 +02:00
..
com/owncloud/android/ui/fragment	Merge remote-tracking branch 'remotes/origin/master' into pinchZoom_new	2017-05-19 10:43:50 +02:00
generic	Fix push	2017-05-16 12:33:44 +02:00
gplay	align app version code/name throughout builds (1.4.3)	2017-05-23 23:47:51 +02:00
main	Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom	2017-06-05 00:38:52 +02:00
modified	changed to default	2017-05-30 08:41:15 +02:00