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

9 years ago · 4c8144d86b
parent fe431902d7 dd825a6426
commit 4c8144d86b
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,7 @@
 /config/configuration.yml
 /config/additional_environment.rb
 /config/oneapm.yml
 /config/environments/production.rb
 /files/*