aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-10-31 17:14:53 +0100
committerChristian S <christian@pix-art.de>2015-10-31 17:14:53 +0100
commitc5dc1628a4068b8af3b2250080897e35937dc815 (patch)
tree727ded0485a61fa64d613defb9b6917d9a6fa0ef /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parent107acd1a5b03d25aa38d1ad73b957482ea781035 (diff)
parentb9de159e97090e132b74e934bc42fa6186105fd2 (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index de4d261c5..9dae18157 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -444,7 +444,7 @@ public abstract class XmppActivity extends Activity {
}
public void switchToAccount(Account account) {
- switchToAccount(account,false);
+ switchToAccount(account, false);
}
public void switchToAccount(Account account, boolean init) {