Merge remote-tracking branch 'origin/1'

# Conflicts: # composer.json
2018-02-07 18:30:04 +13:00 · 2018-02-07 18:30:04 +13:00 · a5d67cfcb9
parent f503cb70dc 60891b866e
commit a5d67cfcb9
5 changed files with 7 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,26 +1,6 @@
-# ignore cache folder
 /silverstripe-cache/
-
-# ignore .env file
 /.env
-
-# ignore build tools
-/tools/phing-metadata
-
-# ignore composer vendor folder
 /vendor/
-
-# ignore default modules from composer
-/asset-admin/
-/campaign-admin/
-/cms/
-/framework/
-/graphql/
-/reports/
-/silverstripe-admin/
-/silverstripe-assets/
-/silverstripe-errorpage/
-/siteconfig/
 /themes/simple/
-/versioned/
-/testsession/
+/resources/
+/public/resources/
--- a/.htaccess
+++ b/.htaccess
@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule .* public/%1
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 BSD 3-Clause License

-Copyright (c) 2017, SilverStripe Ltd.
+Copyright (c) 2018, SilverStripe Ltd.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/composer.json
+++ b/composer.json
@ -33,4 +33,4 @@
    },
    "prefer-stable": true,
    "minimum-stability": "dev"
-}
+}
--- a/public/.gitignore
+++ b/public/.gitignore
@ -0,0 +1 @@
+/resources/