Dominik Schürmann efb1868791 Fix merge conflicts

2016-11-30 13:46:50 +01:00

..

arrays.xml

inline-ttl: create ttl choice customization setting activity

2016-01-06 16:24:12 +01:00

attr.xml

Reintroduce changes made associated with KeyListFragment to new branch.

2016-09-25 17:26:51 +02:00

attrs.xml

fixed crash on api < 21 due to drawable using attrs

2015-08-06 02:02:11 +05:30

colors.xml

Reintroduce changes made associated with KeyListFragment to new branch.

2016-09-25 17:26:51 +02:00

dimens.xml

Unnecesary code removed and string repaired

2016-04-12 15:41:42 +02:00

ids.xml

…

strings.xml

Fix import from keyservers using URL Intent

2016-11-29 22:04:21 +01:00

styles.xml

ImportKeys: Refactoring

2016-08-19 22:35:56 +02:00

themes.xml

Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303

2015-11-02 18:09:41 +01:00