Merge branch 'develop'
# Conflicts: # config/route.php
This commit is contained in:
+4
-1
@@ -7,4 +7,7 @@
|
||||
/tests/tmp
|
||||
/tests/.phpunit.result.cache
|
||||
/public/uploads
|
||||
/webman
|
||||
/webman
|
||||
/start.php
|
||||
/windows.php
|
||||
/bootstrap.php
|
||||
Reference in New Issue
Block a user