Nikolay Pultsin
|
7c15fe932c
|
Merge branch 'master' into dm
Conflicts:
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
|
2014-05-03 03:44:50 +01:00 |
|