sachaaaaa 33ad509fbf Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development ... # Conflicts: # _locales/ar/messages.json # _locales/es_419/messages.json # _locales/he/messages.json # _locales/hi/messages.json # _locales/hr/messages.json # _locales/kn/messages.json # _locales/ko/messages.json # _locales/mk/messages.json # _locales/sr/messages.json # _locales/uk/messages.json # _locales/vi/messages.json # package.json		2018-10-01 09:46:42 +10:00
..
_conversation.scss	Conversations now better take advantage of wide screens	2018-08-15 17:00:32 -07:00
_debugLog.scss	Prettier: Format all stylesheets	2018-05-04 16:32:08 -04:00
_emoji.scss	Style scrollbar	2018-08-09 10:11:12 -07:00
_global.scss	Style scrollbar	2018-08-09 10:11:12 -07:00
_index.scss	added identity key above the conversation box	2018-08-18 21:48:38 +10:00
_ios.scss	iOS theme: higher visibility for embedded contact text	2018-09-06 13:36:32 -07:00
_lightbox.scss	Finish new Message component, integrate into application	2018-07-17 15:58:07 -07:00
_mixins.scss	Finish new Message component, integrate into application	2018-07-17 15:58:07 -07:00
_modal.scss	Finish new Message component, integrate into application	2018-07-17 15:58:07 -07:00
_modules.scss	Show generic attachment for non-loading/too-large images/videos	2018-09-05 17:48:43 -07:00
_options.scss	New React component: Message	2018-07-17 15:53:33 -07:00
_progress.scss	Prettier: Format all stylesheets	2018-05-04 16:32:08 -04:00
_recorder.scss	Finish new Message component, integrate into application	2018-07-17 15:58:07 -07:00
_settings.scss	New media permission, show dialog when not enabled for voice msg	2018-07-03 16:04:21 -07:00
_theme_dark.scss	Copy quoted message contents into quote on receipt	2018-08-15 14:58:55 -07:00
_variables.scss	Copy quoted message contents into quote on receipt	2018-08-15 14:58:55 -07:00
manifest.scss	When iOS device has been linked, use iOS color scheme	2018-08-15 11:22:45 -07:00