Mikunj 2f18c5bad2 Merge branch 'dev' into custom-server ... # Conflicts: # src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt		2019-10-11 15:40:09 +11:00
..
arrays.xml	Updated language translations.	2019-04-30 12:51:58 -07:00
attrs.xml	Add sticker support.	2019-05-30 01:08:01 -04:00
colors.xml	Implement mention rendering	2019-10-10 09:42:40 +11:00
conversation_colors.xml	Remove the ability to set a color for a group.	2018-10-09 15:34:08 -07:00
core_colors.xml	Further Lokify UI	2019-07-22 13:08:56 +10:00
crop_area_renderer.xml	Replace image editor.	2019-05-10 11:57:43 -03:00
dimens.xml	Add sticker support.	2019-05-30 01:08:01 -04:00
emoji.xml	ASCII emoji support	2015-06-03 11:11:24 -07:00
firebase_messaging.xml	FCM improvements.	2019-02-15 14:21:23 -08:00
google-playstore-strings.xml	Just update to the new repo path "github.com/signalapp"	2018-03-11 17:06:22 -07:00
ic_launcher_background.xml	Update app icon	2019-07-24 09:23:01 +10:00
ids.xml	Updated media send UI.	2019-03-18 15:09:56 -07:00
integers.xml	Improve animations on audio controls, enable push to talk	2016-11-21 18:58:10 -08:00
material_colors.xml	Support for stickers and scribbles	2016-12-12 17:37:00 -08:00
strings.xml	Merge branch 'dev' into custom-server	2019-10-11 15:40:09 +11:00
styles.xml	Lint.	2019-05-10 11:57:43 -03:00
text_styles.xml	Lint.	2019-05-10 11:57:43 -03:00
themes.xml	Clean up lock screen UI	2019-08-30 10:24:39 +10:00
values.xml	Migrated to new JobManager.	2019-04-15 10:56:26 -04:00
vector_paths.xml	Improve animations on audio controls, enable push to talk	2016-11-21 18:58:10 -08:00