Revision 1f154adf
ID | 1f154adf4202b08a23878c98b023e619fe6b7d8b |
Parent | 9fd22c92, d287dca8 |
Child | 7451f005 |
Merge branch 'master' into super-fdroid
Conflicts:
AndroidManifest.xml
lint.xml
src/org/fdroid/fdroid/AppDetails.java
Files
- added
- modified
- copied
- renamed
- deleted