Merge branch 'master' into develop

Conflicts: app/src/main/res/values/preference_editor.xml

Merge branch 'master' into develop
Conflicts: app/src/main/res/values/preference_editor.xml
e654ed76 · Grigory Fedorov · 153e03a3 · f7411192 · e654ed76
Commit e654ed76 authored Jun 09, 2015 by Grigory Fedorov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 29 additions and 29 deletions

preference_editor.xml app/src/main/res/values/preference_editor.xml +29 -29

No files found.
--- a/app/src/main/res/values/preference_editor.xml
+++ b/app/src/main/res/values/preference_editor.xml