Nut.andor a01099ab53 Merge branch 'master-Weblate_translations' into switch_to_actual_AndroidStudio ...

# Conflicts:
#	AndorsTrail/app/src/main/res/values-gl/strings.xml

2022-08-20 00:49:13 +02:00

..

app

Merge branch 'master-Weblate_translations' into switch_to_actual_AndroidStudio

2022-08-20 00:49:13 +02:00

assets/translation

Merge branch 'master-Weblate_translations' into switch_to_actual_AndroidStudio

2022-08-20 00:49:13 +02:00

gradle/wrapper

gradle wrapper

2022-07-24 14:01:35 +02:00

play

Migration to actual AndroidStudio version - add whatsnew and Google Play info files

2022-06-18 11:09:03 +02:00

res

Merge branch 'master-Weblate_translations' into switch_to_actual_AndroidStudio

2022-08-20 00:49:13 +02:00

build.gradle

Then replace the url in the tmx files with an https version of it since it makes problems later on (Replace "http://" to "https://" with Notepad++ for all *.tmx files in subfolder XML)

2022-06-18 10:54:56 +02:00

gradlew

Then replace the url in the tmx files with an https version of it since it makes problems later on (Replace "http://" to "https://" with Notepad++ for all *.tmx files in subfolder XML)

2022-06-18 10:54:56 +02:00

gradlew.bat

Then replace the url in the tmx files with an https version of it since it makes problems later on (Replace "http://" to "https://" with Notepad++ for all *.tmx files in subfolder XML)

2022-06-18 10:54:56 +02:00

import-summary.txt

Then replace the url in the tmx files with an https version of it since it makes problems later on (Replace "http://" to "https://" with Notepad++ for all *.tmx files in subfolder XML)

2022-06-18 10:54:56 +02:00

settings.gradle

Then replace the url in the tmx files with an https version of it since it makes problems later on (Replace "http://" to "https://" with Notepad++ for all *.tmx files in subfolder XML)

2022-06-18 10:54:56 +02:00