tom79 1035e2d68d Merge branch 'quick_reply_tom' into develop ... # Conflicts: # app/src/main/java/app/fedilab/android/activities/TootActivity.java # app/src/main/java/app/fedilab/android/services/PeertubeUploadReceiver.java # app/src/main/res/values/strings.xml		2019-06-27 18:14:57 +02:00
..
colors.xml	add quick reply view	2019-06-26 16:51:07 +05:30
dimens.xml	Add tools for editing photo	2019-05-30 15:19:02 +02:00
drawables.xml	initial commit	2017-05-05 16:36:04 +02:00
ic_launcher_background.xml	Change icon launcher	2019-05-18 11:19:59 +02:00
strings.xml	Merge branch 'quick_reply_tom' into develop	2019-06-27 18:14:57 +02:00
styles.xml	Add features for filtering reports	2019-06-20 16:33:29 +02:00