Gemfile · cb8b5c321fb84abc96375be3d06d631621979bdb · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee · 9b140b22
Dmitriy Zaporozhets authored Feb 04, 2015
```
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
```
9b140b22

This project manages its dependencies using Bundler. Learn more

Gemfile 4.92 KB