Skip to content

Commit

Permalink
Merge pull request #471 from themarshallproject/develop
Browse files Browse the repository at this point in the history
v0.5.1
  • Loading branch information
GabeIsman authored Apr 13, 2021
2 parents 249b46f + d5b3afc commit 0cee638
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 117 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ backups/
!/log/.keep
/tmp
pull_dev_database.sh

snapshots
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'
ruby '2.7.2'

gem 'rails', '~> 6.0'
gem 'pg', '~> 0.21'
gem 'rails', '~> 6.0.0'
gem 'pg', '~> 1.0'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'mini_racer', '~> 0.3'
Expand Down
Loading

0 comments on commit 0cee638

Please sign in to comment.