[merge]

2016-01-17 11:48:23 -08:00
parent 76bd8e78cc
commit 5dbe43f42d
581 changed files with 1077 additions and 125423 deletions
@@ -51,8 +51,6 @@ pickle-email-*.html
 # We'll be testing in 'preview' to avoid clashes 
 Gemfile.lock

-
-
 # Ignore Redis' dataset snapshot
 dump.rdb

@@ -75,6 +73,9 @@ brakeman.html
 /app/assets/stylesheets/translations/*
 /app/assets/stylesheets/web-fonts/*

+# Ignore test artifacts
+/config/locales/data/html_records/*
+
 # Ignore sensitive data
 /config/settings/local.rb
 /nbproject/private/