mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 23:27:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-notes-android/app
History
Stefan Niedermann 674fc96694 Merge branch 'master' into 831-room 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
#	app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/edit/format/ContextBasedRangeFormattingCallback.java
#	app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
#	app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java
#	app/src/main/java/it/niedermann/owncloud/notes/shared/util/NotesColorUtil.java
2020-11-18 15:04:35 +01:00
..
src Merge branch 'master' into 831-room 2020-11-18 15:04:35 +01: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 Bump minSdk to KitKat 2020-10-30 13:00:07 +01: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