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
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -10,6 +10,7 @@
|
|||||||
output.json
|
output.json
|
||||||
output-metadata.json
|
output-metadata.json
|
||||||
desktop.ini
|
desktop.ini
|
||||||
|
sync.ffs_db
|
||||||
|
|
||||||
.bak
|
.bak
|
||||||
.git
|
.git
|
||||||
|
|||||||
Reference in New Issue
Block a user