nextcloud-notes-android/app/src
stefan-niedermann 7d1de66625 Merge branch 'master' into weblogin
# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
#	app/src/main/res/values/strings.xml
2019-02-08 12:06:25 +01:00
..
androidTest/java/it/niedermann/owncloud/notes Introduce ButterKnife and code reformat 2018-04-11 15:37:28 +02:00
main Merge branch 'master' into weblogin 2019-02-08 12:06:25 +01:00