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
..
gradle-wrapper.jar	Add gradle directory	2014-10-22 12:42:28 -04:00
gradle-wrapper.properties	Merge branch 'master' of https://codeberg.org/iNPUTmice/Conversations	2023-12-17 22:14:36 +01:00