tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.
This commit is contained in:
Claire
2021-01-26 14:01:30 +01:00
parent d1255ab8a5 7f1c56954b
commit b81710c02c
26 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -13,7 +13,7 @@ gem 'rack', '~> 2.2.3'
gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.2'
gem 'makara', '~> 0.4'
gem 'makara', '~> 0.5'
gem 'pghero', '~> 2.7'
gem 'dotenv-rails', '~> 2.7'