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

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

Browse Source 
Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
This commit is contained in:
Thibaut Girka
2020-04-12 16:50:27 +02:00
parent 51bbf0b68d 490ff09c5a
commit fdd0beefa7
17 changed files with 247 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -133,7 +133,7 @@ end
group :development do
gem 'active_record_query_trace', '~> 1.7'
gem 'annotate', '~> 3.0'
gem 'annotate', '~> 3.1'
gem 'better_errors', '~> 2.6'
gem 'binding_of_caller', '~> 0.7'
gem 'bullet', '~> 6.1'