aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-17 15:56:54 +0100
committerlookshe <github@lookshe.org>2016-03-17 15:56:54 +0100
commitfb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (patch)
treecf0fb5a62aefaf34fd8e134fa20c91fe641c0898 /.gitignore
parent25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (diff)
parentc4b1f6171d2bf82e44a3ba567f7732cc8beef717 (diff)
Merge tag '1.11.1' into trz/merge_1.11.1
Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions