Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: Gemfile.lock
2018-01-15 22:17:48 -06:00
parent 0c7dc6c781 5276c0a090
commit 89a9d629f7
111 changed files with 863 additions and 719 deletions
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module MailerHelper
+end