OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
Files
bd33ec7eddce7cacecbfff93ba9fa2caf1420f93
andors-trail/AndorsTrail/assets
History
Nut.andor bd33ec7edd Merge remote-tracking branch 'Andors-Trail/test_fungi' into master 
# Conflicts:
#	AndorsTrail/AndroidManifest.xml
#	AndorsTrail/assets/translation/cs.po
#	AndorsTrail/assets/translation/de.po
#	AndorsTrail/assets/translation/es.po
#	AndorsTrail/assets/translation/ja.po
#	AndorsTrail/assets/translation/ru.po
#	AndorsTrail/assets/translation/tr.po
#	AndorsTrail/assets/translation/zh_CN.po
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
2021-01-24 23:18:45 +01:00
..
translation
Merge remote-tracking branch 'Andors-Trail/test_fungi' into master
2021-01-24 23:18:45 +01:00