Morgan Pretty 028ba0c77a Merge branch 'dev' into feature/message-requests ... # Conflicts: # Session/Meta/Translations/de.lproj/Localizable.strings # Session/Meta/Translations/en.lproj/Localizable.strings # Session/Meta/Translations/es.lproj/Localizable.strings # Session/Meta/Translations/fa.lproj/Localizable.strings # Session/Meta/Translations/fi.lproj/Localizable.strings # Session/Meta/Translations/fr.lproj/Localizable.strings # Session/Meta/Translations/hi.lproj/Localizable.strings # Session/Meta/Translations/hr.lproj/Localizable.strings # Session/Meta/Translations/id-ID.lproj/Localizable.strings # Session/Meta/Translations/it.lproj/Localizable.strings # Session/Meta/Translations/ja.lproj/Localizable.strings # Session/Meta/Translations/nl.lproj/Localizable.strings # Session/Meta/Translations/pl.lproj/Localizable.strings # Session/Meta/Translations/pt_BR.lproj/Localizable.strings # Session/Meta/Translations/ru.lproj/Localizable.strings # Session/Meta/Translations/si.lproj/Localizable.strings # Session/Meta/Translations/sk.lproj/Localizable.strings # Session/Meta/Translations/sv.lproj/Localizable.strings # Session/Meta/Translations/th.lproj/Localizable.strings # Session/Meta/Translations/vi-VN.lproj/Localizable.strings # Session/Meta/Translations/zh-Hant.lproj/Localizable.strings # Session/Meta/Translations/zh_CN.lproj/Localizable.strings		2022-02-25 12:48:38 +11:00
..
Colors.xcassets	Merge branch 'dev' into feature/message-requests	2022-02-25 12:48:38 +11:00
AppMode.swift	Fixed a couple of bugs with the share extension	2022-02-11 13:05:10 +11:00
Colors.swift	Merge branch 'dev' into feature/message-requests	2022-02-04 11:49:54 +11:00
Fonts.swift	Create SessionUIKit	2020-11-09 16:03:59 +11:00
Gradients.swift	Redesign conversation screen part 1	2021-02-09 15:14:18 +11:00
Notification+AppMode.swift	Make everything build again	2020-11-11 17:45:50 +11:00
Values.swift	Clean	2021-02-22 15:10:01 +11:00