mirror of https://github.com/oxen-io/session-ios
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.
8109a326cf
# Conflicts: # Session.xcodeproj/project.pbxproj # Session/Closed Groups/NewClosedGroupVC.swift # Session/Conversations/ConversationVC+Interaction.swift # Session/Conversations/Message Cells/CallMessageCell.swift # Session/Conversations/Views & Modals/JoinOpenGroupModal.swift # Session/Home/HomeVC.swift # Session/Home/New Conversation/NewDMVC.swift # Session/Home/NewConversationButtonSet.swift # 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 # Session/Open Groups/JoinOpenGroupVC.swift # Session/Open Groups/OpenGroupSuggestionGrid.swift # Session/Settings/SettingsVC.swift # Session/Shared/BaseVC.swift # Session/Shared/OWSQRCodeScanningViewController.m # Session/Shared/ScanQRCodeWrapperVC.swift # Session/Shared/UserCell.swift # SessionMessagingKit/Configuration.swift # SessionShareExtension/SAEScreenLockViewController.swift # SessionUIKit/Style Guide/Gradients.swift # SignalUtilitiesKit/Media Viewing & Editing/OWSViewController+ImageEditor.swift # SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m |
3 years ago | |
|---|---|---|
| .. | ||
| AppIcon.appiconset | 5 years ago | |
| Loki | 4 years ago | |
| NavBarBack.imageset | 4 years ago | |
| NavBarBackRTL.imageset | 4 years ago | |
| Session | 3 years ago | |
| actionsheet_camera_black.imageset | 5 years ago | |
| actionsheet_camera_roll_black.imageset | 5 years ago | |
| actionsheet_document_black.imageset | 5 years ago | |
| actionsheet_gif_black.imageset | 5 years ago | |
| attachment_audio.imageset | 5 years ago | |
| conversation_settings_search.imageset | 5 years ago | |
| disappearing_message_00.imageset | 5 years ago | |
| disappearing_message_05.imageset | 5 years ago | |
| disappearing_message_10.imageset | 5 years ago | |
| disappearing_message_15.imageset | 5 years ago | |
| disappearing_message_20.imageset | 5 years ago | |
| disappearing_message_25.imageset | 5 years ago | |
| disappearing_message_30.imageset | 5 years ago | |
| disappearing_message_35.imageset | 5 years ago | |
| disappearing_message_40.imageset | 5 years ago | |
| disappearing_message_45.imageset | 5 years ago | |
| disappearing_message_50.imageset | 5 years ago | |
| disappearing_message_55.imageset | 5 years ago | |
| disappearing_message_60.imageset | 5 years ago | |
| giphy_logo.imageset | 5 years ago | |
| ic_block.imageset | 5 years ago | |
| ic_chevron_down.imageset | 5 years ago | |
| ic_chevron_up.imageset | 5 years ago | |
| ic_copy.imageset | 5 years ago | |
| ic_dark_theme_off.imageset | 4 years ago | |
| ic_dark_theme_on.imageset | 4 years ago | |
| ic_download.imageset | 5 years ago | |
| ic_flash_mode_auto.imageset | 5 years ago | |
| ic_flash_mode_off.imageset | 5 years ago | |
| ic_flash_mode_on.imageset | 5 years ago | |
| ic_gallery_badge_gif.imageset | 5 years ago | |
| ic_gallery_badge_video.imageset | 5 years ago | |
| ic_info.imageset | 5 years ago | |
| ic_lock_outline.imageset | 5 years ago | |
| ic_plus_24.imageset | 5 years ago | |
| ic_reply.imageset | 5 years ago | |
| ic_switch_camera.imageset | 5 years ago | |
| ic_theme_auto.imageset | 4 years ago | |
| ic_timer.imageset | 5 years ago | |
| ic_timer_disabled.imageset | 5 years ago | |
| ic_trash.imageset | 5 years ago | |
| image_editor_brush.imageset | 4 years ago | |
| image_editor_caption.imageset | 4 years ago | |
| image_editor_checkmark_empty.imageset | 4 years ago | |
| image_editor_checkmark_full.imageset | 4 years ago | |
| image_editor_crop.imageset | 4 years ago | |
| image_editor_crop_lock.imageset | 4 years ago | |
| image_editor_crop_unlock.imageset | 4 years ago | |
| image_editor_flip.imageset | 4 years ago | |
| image_editor_rotate.imageset | 4 years ago | |
| image_editor_text.imageset | 4 years ago | |
| image_editor_undo.imageset | 4 years ago | |
| media_album_caption.imageset | 5 years ago | |
| media_invalid.imageset | 5 years ago | |
| media_retry.imageset | 5 years ago | |
| media_send_batch_mode_disabled.imageset | 5 years ago | |
| navbar_disclosure_down.imageset | 5 years ago | |
| searchbar_clear.imageset | 5 years ago | |
| searchbar_search.imageset | 5 years ago | |
| selected_blue_circle.imageset | 5 years ago | |
| settings-avatar-camera-2.imageset | 5 years ago | |
| sliderProgressThumb.imageset | 4 years ago | |
| small_chevron_left.imageset | 5 years ago | |
| small_chevron_right.imageset | 5 years ago | |
| system_disclosure_indicator.imageset | 5 years ago | |
| system_disclosure_indicator_rtl.imageset | 5 years ago | |
| table_ic_block.imageset | 5 years ago | |
| table_ic_group_edit.imageset | 5 years ago | |
| table_ic_group_leave.imageset | 5 years ago | |
| table_ic_notification_sound.imageset | 5 years ago | |
| x-24.imageset | 3 years ago | |
| Contents.json | 4 years ago | |