Stefan Niedermann b5dbfb4734 Merge branch 'master' into api-v1 ... # Conflicts: # app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java		2020-06-13 12:48:44 +02:00
..
src	Merge branch 'master' into api-v1	2020-06-13 12:48:44 +02:00
.classpath	Initial commit	2015-10-01 17:54:20 +02:00
.gitignore	Added flavor builds to .gitignore	2020-03-27 10:20:05 +01:00
.project	Initial commit	2015-10-01 17:54:20 +02:00
build.gradle	version bump to v2.15.0	2020-06-13 10:53:55 +02:00
proguard-project.txt	Initial commit	2015-10-01 17:54:20 +02:00
proguard-rules.pro	Initial commit	2015-10-01 17:54:20 +02:00
project.properties	Introduce ButterKnife and code reformat	2018-04-11 15:37:28 +02:00