zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-30 01:20:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into story/105855968-directo

Browse source 
# Conflicts:
#	Gemfile
#	Gemfile.lock
This commit is contained in:
Vladimir Krylov 2016-03-22 11:47:32 +02:00
parent da7fed9577
commit adfb138197
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Gemfile.lock
View file

@ -45,15 +45,6 @@ GIT
bundler (~> 1.2) bundler (~> 1.2)
thor (~> 0.18) thor (~> 0.18)
GIT
remote: https://github.com/svenfuchs/rails-i18n.git
revision: 4913b54a5d7026066ceb12a4523476a1411e86bb
branch: rails-4-x
specs:
rails-i18n (4.0.8)
i18n (~> 0.7)
railties (~> 4.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs: