AndyScherzinger c1c306150f fix compile error after lib merges ... # Conflicts: # src/com/owncloud/android/ui/activity/ShareActivity.java		2017-05-13 13:48:53 +02:00
..
generic	Fix build	2017-05-02 14:15:36 +02:00
gplay	Fix push things	2017-05-08 15:47:20 +02:00
main	fix compile error after lib merges	2017-05-13 13:48:53 +02:00
modified	added privacy webview	2017-05-12 12:43:36 +02:00