Commit Graph

21 Commits

Author SHA1 Message Date
Damian Mooyman
638bba7028
Merge 1 into master 2017-10-12 14:41:02 +13:00
Damian Mooyman
c67d507737
Merge remote-tracking branch 'origin/1.0' into 1
# Conflicts:
#	composer.json
2017-10-12 14:40:04 +13:00
Damian Mooyman
b69371c244
Update graphql dependency 2017-10-12 14:39:00 +13:00
Damian Mooyman
c98bdd1ced
Merge 1 into master 2017-10-12 10:35:29 +13:00
Damian Mooyman
f97a8f5c9c
Update dependencies 2017-10-12 10:31:18 +13:00
Damian Mooyman
1808566e1d Merge remote-tracking branch 'origin/1.0' into 1
# Conflicts:
#	composer.json
2017-10-12 10:29:27 +13:00
Damian Mooyman
72b7d5a77c Merge pull request #2 from silverstripe/pulls/2.0/remove-1-branch-alias
FIX Remove 1.x branch alias from master branch
2017-10-12 10:06:55 +13:00
Damian Mooyman
2906940d5d Merge pull request #1 from silverstripe/pulls/1.1/branch-alias
Bump branch alias to 1.1.x-dev
2017-10-12 10:06:40 +13:00
Robbie Averill
5a55af2131 FIX Remove 1.x branch alias from master branch 2017-10-12 09:59:00 +13:00
Robbie Averill
db04f72872 Bump branch alias to 1.1.x-dev 2017-10-12 09:57:38 +13:00
Damian Mooyman
b616717e56 Remove obsolete branch-alias 2017-10-11 17:31:49 +13:00
Damian Mooyman
6a99b4b39a Fix plugin version constraint 2017-07-25 11:13:12 +12:00
Damian Mooyman
b8f5ead0c2
no message 2017-07-11 15:39:26 +12:00
Damian Mooyman
f97a984c71
Wrong recipe-core version 2017-07-11 15:38:33 +12:00
Damian Mooyman
9a06a37169
Merge remote-tracking branch 'origin/1' 2017-07-11 15:35:47 +12:00
Damian Mooyman
bbd831de2e
Add homepage and license info 2017-07-11 15:35:24 +12:00
Damian Mooyman
33d0057f18 Fix name 2017-07-11 15:32:04 +12:00
Damian Mooyman
167cf2c243
Fix name 2017-07-11 15:31:29 +12:00
Damian Mooyman
20ac817386
Create SilverStripe 5.x recipe version for master 2017-07-11 15:17:57 +12:00
Damian Mooyman
488879d45c
Add core cms recipe config 2017-07-11 15:16:08 +12:00
Damian Mooyman
7d7af93c3d Initial commit 2017-07-11 15:02:59 +12:00