Merge branch 'hotfix/1.3.9'

jmalcic · Mar 14, 2021 · 7960be3 · 7960be3
2 parents e6bda6f + 5cd0abb
commit 7960be3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@ test/dummy/node_modules/
 test/dummy/yarn-error.log
 test/dummy/storage/
 test/dummy/tmp/
+test/dummy/config/master.key
+test/dummy/config/credentials.yml.enc
 tmp/
 
 test/dummy/public/assets

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spina-admin-conferences (1.3.8)
+    spina-admin-conferences (1.3.9)
       icalendar (~> 2.5)
       rails (~> 6.0)
       rails-i18n (~> 6.0)
@@ -177,7 +177,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mobility (1.0.1)
+    mobility (1.1.1)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
     nio4r (2.5.7)

diff --git a/app/assets/config/spina_admin_conferences_manifest.js b/app/assets/config/spina_admin_conferences_manifest.js
@@ -1,5 +1,3 @@
-//= link spina/trix.js
-//= link spina/trix.css
 //= link spina_manifest.js
 //= link spina/admin/conferences/application.css
 //= link_tree ../javascripts
diff --git a/lib/spina/admin/conferences/version.rb b/lib/spina/admin/conferences/version.rb
@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '1.3.8'
+      VERSION = '1.3.9'
     end
   end
 end