aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ContactsActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-12 10:22:18 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-12 10:22:18 +0200
commitf57b669f83c384f1245842c4b89525c7c43d6ec9 (patch)
tree3cd20e3d8cf6d97d9f5538a652503fbe9fb761ba /src/eu/siacs/conversations/ui/ContactsActivity.java
parentd936a830e4866f070ba7726ecb845cc66644a238 (diff)
parentf3b07250ddabb612e9cd9fc7985c7d97a9b844d8 (diff)
Merge branch 'development' of https://github.com/strb/Conversations into strb-development
Diffstat (limited to 'src/eu/siacs/conversations/ui/ContactsActivity.java')
0 files changed, 0 insertions, 0 deletions