Revision cee9d880
ID | cee9d880f49301ec55f04fc5c979b854792bf3ce |
Parent | af8f00f4, 3c5f1e2d |
Child | d0eb3476 |
Merge branch 'v12_final_fixes' of https://github.com/n8fr8/Gibberbot into n8fr8-v12_final_fixes
Conflicts:
AndroidManifest.xml
Files
- added
- modified
- copied
- renamed
- deleted