Merge branch 'aiselp-master'

# Conflicts: # app/src/main/java/org/autojs/autojs/core/looper/Timer.kt # app/src/main/java/org/autojs/autojs/engine/module/AssetAndUrlModuleSourceProvider.kt # version.properties
2023-07-12 15:33:27 +08:00
parent 26eb5a6db5 ace958aaf6
commit 1e74d1806f
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 output.json
 output-metadata.json
 desktop.ini
+sync.ffs_db

 .bak
 .git