sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-08 07:06:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into fix-issue-187

Browse source 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
This commit is contained in:
Phillip Thelen 2015-12-13 15:16:29 +01:00
commit a8cd69aa22
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/src/com/habitrpg/android/habitica/MainActivity.java
View file

@ -136,7 +136,6 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb
new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
if (toolbar != null) {
setSupportActionBar(toolbar);