Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
yuanke 2016-09-18 16:48:29 +08:00
commit 4c8144d86b
1 changed files with 1 additions and 0 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
/config/configuration.yml
/config/additional_environment.rb
/config/oneapm.yml
/config/environments/production.rb
/files/*