diff options
| author | Camil Staps | 2015-06-10 22:58:20 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 22:58:20 +0200 |
| commit | 0e3c24d59c8b2e455b66a2adc100f70666b7e151 (patch) | |
| tree | a3736bcdb921ac18bea23da3d1abaa4d1a6f667c /gradle/wrapper/gradle-wrapper.properties | |
| parent | working... (diff) | |
| parent | Merge branch 'master' of http://github.com/camilstaps/RSSin (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/android/FeedItemAdapter.java
app/src/main/java/org/rssin/rssin/Feed.java
Diffstat (limited to 'gradle/wrapper/gradle-wrapper.properties')
0 files changed, 0 insertions, 0 deletions