Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@colintucker
colintucker committed Oct 11, 2017
2 parents 9629058 + d5d1a21 commit e47c4e7
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,8 @@ _ss_environment.php
!/assets/Uploads/
!/assets/Uploads/silverware-logo.png

### SilverStripe Resources ###
/resources

# START Do not modify the lines between here and #END, they will be regenerated by GitIgnoreEditor
# END of GitIgnoreEditor

0 comments on commit e47c4e7

Please sign in to comment.