Sebastian Ziebell eefb27f5ae Merge branch 'master' into fixes/api ... Conflicts: spec/requests/api/projects_spec.rb		2013-02-20 12:43:32 +01:00
..
environments	…
initializers	Merge pull request #2991 from raphendyr/username_change_disablation	2013-02-18 09:59:24 -08:00
locales	…
application.rb	…
boot.rb	…
database.yml.mysql	…
database.yml.postgresql	…
environment.rb	…
gitlab.yml.example	Add option to disable username changing	2013-02-14 17:58:56 +02:00
resque.yml.example	…
routes.rb	Merge branch 'master' into fixes/api	2013-02-20 12:43:32 +01:00
unicorn.rb.example	…