Marin Jankovski 3945ed65cf Merge remote-tracking branch 'ce/master' into ce_into_ee ...

Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.9.md

2015-03-17 15:00:13 -07:00

..

assets

Merge branch 'ce-to-ee' into 'master'

2015-03-17 19:10:14 +00:00

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-17 10:19:31 -07:00

finders

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

helpers

Merge branch 'share-with-different-group' into 'master'

2015-03-17 17:17:26 +00:00

mailers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

models

Merge branch 'ce-to-ee' into 'master'

2015-03-17 19:10:14 +00:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-17 10:19:31 -07:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge remote-tracking branch 'ce/master' into ce_into_ee

2015-03-17 15:00:13 -07:00

workers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00