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
This commit is contained in:
Thibaut Girka
2019-02-28 21:35:53 +01:00
parent 76ed481aa7 ee7d79c0ce
commit 2267eee356
22 changed files with 417 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@ -126,7 +126,7 @@ GEM
sshkit (~> 1.3)
capistrano-yarn (2.0.2)
capistrano (~> 3.0)
capybara (3.13.2)
capybara (3.14.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@ -243,7 +243,7 @@ GEM
temple (>= 0.8.0)
thor
tilt
hamlit-rails (0.2.1)
hamlit-rails (0.2.2)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
hamlit (>= 1.2.0)
@ -673,7 +673,7 @@ DEPENDENCIES
capistrano-rails (~> 1.4)
capistrano-rbenv (~> 2.1)
capistrano-yarn (~> 2.0)
capybara (~> 3.13)
capybara (~> 3.14)
charlock_holmes (~> 0.7.6)
chewy (~> 5.0)
cld3 (~> 3.2.3)