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

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
David Yip
2018-01-15 22:17:48 -06:00
parent 0c7dc6c781 5276c0a090
commit 89a9d629f7
111 changed files with 863 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -50,6 +50,7 @@ gem 'oj', '~> 3.3'
gem 'ostatus2', '~> 2.0'
gem 'ox', '~> 2.8'
gem 'pundit', '~> 1.1'
gem 'premailer-rails'
gem 'rack-attack', '~> 5.0'
gem 'rack-cors', '~> 0.4', require: 'rack/cors'
gem 'rack-timeout', '~> 0.4'