kosyak b9f5286898 Merge branch 'master' of https://codeberg.org/iNPUTmice/Conversations ... # Conflicts: # build.gradle # src/main/AndroidManifest.xml # src/main/java/eu/siacs/conversations/Config.java # src/main/java/eu/siacs/conversations/entities/Bookmark.java # src/main/java/eu/siacs/conversations/parser/MessageParser.java # src/main/java/eu/siacs/conversations/ui/ConversationFragment.java # src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java # src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java # src/main/java/eu/siacs/conversations/ui/XmppActivity.java # src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java # src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java # src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java # src/main/res/values/strings.xml		2023-12-17 22:14:36 +01:00
..
fastlane/metadata/android	Translated using Weblate (Galician)	2023-12-13 06:44:44 +00:00
java/eu/siacs/conversations	support primary color picker	2023-10-24 02:28:07 +02:00
res	Merge branch 'master' of https://codeberg.org/iNPUTmice/Conversations	2023-12-17 22:14:36 +01:00
AndroidManifest.xml	Quicksy: remove REQUEST_INSTALL_PACKAGES permission	2022-12-12 09:27:03 +01:00
new_launcher-web.png	use adaptive launcher icon and notification icon for quicksy	2018-12-14 16:22:24 +01:00