Christian Basler e8de311d7e Merge remote-tracking branch 'origin/develop' into feature/SyncAdapter ...

Conflicts:
	app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java
	app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java
	app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java
	app/src/main/res/values-de/strings.xml
	app/src/main/res/values/strings.xml

2015-10-18 19:00:51 +02:00

..

src/main

Merge remote-tracking branch 'origin/develop' into feature/SyncAdapter

2015-10-18 19:00:51 +02:00

.gitignore

Initial commit

2015-08-05 19:48:41 +02:00

build.gradle

Changed notification icon and updated library versions

2015-10-18 16:42:41 +02:00

proguard-rules.pro

Initial commit

2015-08-05 19:48:41 +02:00