Mikunj 8808100796 Merge signal-1.24.0 ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # background.html # config/default.json # config/production.json # js/models/conversations.js # js/models/messages.js # js/views/conversation_view.js # js/views/inbox_view.js # js/views/settings_view.js # main.js # package.json # test/index.html # ts/components/conversation/ContactName.tsx # yarn.lock		2019-04-18 12:45:19 +10:00
..
_conversation.scss	Added password confirmation dialog before showing seeds.	2019-04-12 14:48:15 +10:00
_debugLog.scss	Prettier: Format all stylesheets	2018-05-04 16:32:08 -04:00
_emoji.scss	Move left pane entirely to React	2019-03-12 17:44:14 -07:00
_global.scss	Left pane changes.	2019-04-17 16:42:09 +10:00
_index.scss	Left pane changes.	2019-04-17 16:42:09 +10:00
_ios.scss	Merge v1.23.0	2019-04-18 11:12:02 +10: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	Merge v1.23.0	2019-04-18 11:12:02 +10:00
_options.scss	New React component: Message	2018-07-17 15:53:33 -07:00
_password.scss	Added db resetting.	2019-01-29 12:57:24 +11:00
_progress.scss	Prettier: Format all stylesheets	2018-05-04 16:32:08 -04:00
_recorder.scss	Move left pane entirely to React	2019-03-12 17:44:14 -07:00
_settings.scss	Merge branch 'textsecure/master' into merge_1_21_0	2019-02-06 13:53:20 +11:00
_theme_dark.scss	Merge v1.23.0	2019-04-18 11:12:02 +10:00
_variables.scss	Merge signal-1.24.0	2019-04-18 12:45:19 +10:00
manifest.scss	Rename launcherView to passwordView.	2018-12-06 15:39:17 +11:00