diff options
| author | Camil Staps | 2015-06-14 11:29:50 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-14 11:29:50 +0200 |
| commit | 02c1ec4bc4ead7ef1b30c1fd947ffef533f89733 (patch) | |
| tree | 3708bc06df4ba882a3f547b026a278a0b057584b /app/src/main/res/values/strings_activity_settings.xml | |
| parent | Fix for sorting on a separate thread (diff) | |
| parent | Fix for sorting on a separate thread (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
Diffstat (limited to 'app/src/main/res/values/strings_activity_settings.xml')
0 files changed, 0 insertions, 0 deletions