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

..

labels.xml

Added proper message list, and almost nice notifications

2015-08-28 13:49:53 +02:00

library_fab_speed_dial_strings.xml

Added missing libraries for AboutLibraries dialog

2016-10-05 15:59:24 +02:00

library_filepicker_strings.xml

Added missing libraries for AboutLibraries dialog

2016-10-05 15:59:24 +02:00

library_jabit_strings.xml

Identity creation dialog improvements

2016-10-02 16:27:01 +02:00

library_zxing_strings.xml

Added missing libraries for AboutLibraries dialog

2016-10-05 15:59:24 +02:00

library_zxingandroidembedded_strings.xml

Added missing libraries for AboutLibraries dialog

2016-10-05 15:59:24 +02:00

strings.xml

Merge remote-tracking branch 'origin/develop' into feature/support-info

2016-10-07 23:13:06 +02:00