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:
	app/models/user.rb

Resolved by adding :default_language to user settings fields
This commit is contained in:
Thibaut Girka
2018-06-21 20:49:57 +02:00
parent 26c20a4ec7 7f59206944
commit ab5f450700
129 changed files with 1169 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@ -88,7 +88,7 @@ GEM
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
aws-sigv4 (1.0.2)
bcrypt (3.1.11)
bcrypt (3.1.12)
benchmark-ips (2.7.2)
better_errors (2.4.0)
coderay (>= 1.0.0)
@ -569,7 +569,7 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@ -767,4 +767,4 @@ RUBY VERSION
ruby 2.5.0p0
BUNDLED WITH
1.16.1
1.16.2