Christian Basler 30bb407bbf Merge remote-tracking branch 'origin/develop' into feature/support-info ... # Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values/strings.xml		2016-10-07 23:13:06 +02:00
..
drawable	Fixed some layouts and updated dependencies	2016-10-06 22:01:33 +02:00
drawable-v21	Some layout improvements and fixes	2016-10-01 17:40:38 +02:00
layout	Fixed some layouts and updated dependencies	2016-10-06 22:01:33 +02:00
layout-w720dp	Fixed some layouts and updated dependencies	2016-10-06 22:01:33 +02:00
menu	Refactored adding new identities	2016-10-01 10:33:11 +02:00
mipmap-hdpi	Updated libraries, most notably Jabit to develop-SNAPSHOT	2016-08-12 23:54:01 +02:00
mipmap-mdpi	Updated libraries, most notably Jabit to develop-SNAPSHOT	2016-08-12 23:54:01 +02:00
mipmap-xhdpi	Updated libraries, most notably Jabit to develop-SNAPSHOT	2016-08-12 23:54:01 +02:00
mipmap-xxhdpi	Updated libraries, most notably Jabit to develop-SNAPSHOT	2016-08-12 23:54:01 +02:00
mipmap-xxxhdpi	Updated libraries, most notably Jabit to develop-SNAPSHOT	2016-08-12 23:54:01 +02:00
values	Merge remote-tracking branch 'origin/develop' into feature/support-info	2016-10-07 23:13:06 +02:00
values-de	Merge remote-tracking branch 'origin/develop' into feature/support-info	2016-10-07 23:13:06 +02:00
values-w820dp	Receiving almost works, unfortunately, JDBC doesn't so I have to rewrite the whole damn repository code.	2015-08-14 17:25:05 +02:00
xml	Added info on supporting development to preferences screen	2016-09-23 16:33:19 +02:00