aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/services/EventReceiver.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-16 18:45:08 +0200
committerlookshe <github@lookshe.org>2015-08-16 18:45:08 +0200
commit89b28a496542b1995f60efb6b8937d11adf8e425 (patch)
tree2039e26dd5d3fdd8ce3ce277ff1bff8324f32f6e /src/main/java/de/thedevstack/conversationsplus/services/EventReceiver.java
parenta76de90fe7a53220e9358d38fa7b47b63f7694fe (diff)
parent0321ebb7a6785b4673376f9e6458e41dd96b2230 (diff)
Merge branch 'trz/rebase' into trz/rename
Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/services/EventReceiver.java')
0 files changed, 0 insertions, 0 deletions