Douwe Maan 2bb2ade50d Merge branch 'master' into license ...

# Conflicts:
#	db/schema.rb

2015-05-05 13:03:33 +02:00

..

assets

Merge branch 'master' into license

2015-05-05 13:03:33 +02:00

controllers

Merge branch 'master' into license

2015-05-05 13:03:33 +02:00

finders

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

2015-05-05 10:18:27 +02:00

helpers

Merge branch 'master' into license

2015-05-05 13:03:33 +02:00

mailers

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

2015-05-05 10:18:27 +02:00

models

Merge branch 'master' into license

2015-05-05 13:03:33 +02:00

services

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

2015-05-05 10:18:27 +02:00

uploaders

Fix URL to uploaded file.

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

views

Merge branch 'master' into license

2015-05-05 13:03:33 +02:00

workers

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

2015-05-05 10:18:27 +02:00