You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-desktop/stylesheets
Mikunj e343a04eea Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22
# Conflicts:
#	app/sql.js
#	background.html
#	config/default.json
#	js/background.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/modules/data.js
#	js/signal_protocol_store.js
#	js/views/conversation_search_view.js
#	libtextsecure/message_receiver.js
#	libtextsecure/sendmessage.js
#	main.js
#	package.json
#	preload.js
#	test/index.html
#	ts/components/Avatar.tsx
#	ts/components/conversation/ConversationHeader.md
#	ts/components/conversation/ConversationHeader.tsx
6 years ago
..
_conversation.scss Added password confirmation dialog before showing seeds. 6 years ago
_debugLog.scss Prettier: Format all stylesheets 7 years ago
_emoji.scss Some style and interaction fine-tuning 6 years ago
_global.scss Changed registration to be a 2 step process. 6 years ago
_index.scss Fix loki image stretching randomly 6 years ago
_ios.scss Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22 6 years ago
_lightbox.scss Finish new Message component, integrate into application 7 years ago
_mixins.scss Finish new Message component, integrate into application 7 years ago
_modal.scss Finish new Message component, integrate into application 7 years ago
_modules.scss Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22 6 years ago
_options.scss New React component: Message 7 years ago
_password.scss Added db resetting. 6 years ago
_progress.scss Prettier: Format all stylesheets 7 years ago
_recorder.scss Some style and interaction fine-tuning 6 years ago
_settings.scss Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
_theme_dark.scss Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22 6 years ago
_variables.scss Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22 6 years ago
manifest.scss Rename launcherView to passwordView. 6 years ago