tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1'

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Damian Mooyman 2018-02-07 18:30:04 +13:00
commit a5d67cfcb9
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
5 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.gitignore vendored
View File

@ -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/

2
.htaccess Normal file
View File

@ -0,0 +1,2 @@
RewriteEngine On
RewriteRule .* public/%1

2
LICENSE
View File

@ -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

2
composer.json
View File

@ -33,4 +33,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}

1
public/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/resources/