Merge branch 'release/1.15.0'

vorons · Dec 12, 2020 · a58849c · a58849c
2 parents 17475ba + 8265fe4
commit a58849c
Show file tree

Hide file tree

Showing 12 changed files with 4,296 additions and 5,605 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-.DS_*
-.DS_Store
+.DS_* 
 *.log
 .idea
 logs
@@ -10,14 +9,14 @@ npm-debug.log
 yarn-error.log
 video
 dist_electron
-fix.sh
+/app/*.sh
 /internal
 android
 bg.jpg
-.env.local
+*.local
 .htaccess
 .htaccess 2
-app/tmp
+tmp
 ios/Briefing/Briefing.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/UserInterfaceState.xcuserstate
 ios/Briefing/Briefing.xcodeproj/xcuserdata/dirk.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
 ios/Briefing/Briefing.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist