Skip to content

Commit 0cee638

Browse files
authored
Merge pull request #471 from themarshallproject/develop
v0.5.1
2 parents 249b46f + d5b3afc commit 0cee638

File tree

5 files changed

+133
-117
lines changed

5 files changed

+133
-117
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ backups/
88
!/log/.keep
99
/tmp
1010
pull_dev_database.sh
11+
12+
snapshots

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source 'https://rubygems.org'
22
ruby '2.7.2'
33

4-
gem 'rails', '~> 6.0'
5-
gem 'pg', '~> 0.21'
4+
gem 'rails', '~> 6.0.0'
5+
gem 'pg', '~> 1.0'
66
gem 'sass-rails', '~> 5.0'
77
gem 'uglifier', '>= 1.3.0'
88
gem 'mini_racer', '~> 0.3'

0 commit comments

Comments
 (0)