Marin Jankovski 6ab5127bfa Merge branch 'master' into group_membership_lock ...

Conflicts:
	db/schema.rb

2014-12-16 14:34:32 +01:00

..

assets

Kerberos support

2014-12-15 18:06:17 +02:00

controllers

Merge branch 'master' into group_membership_lock

2014-12-16 14:34:32 +01:00

finders

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

helpers

Merge branch 'master' into group_membership_lock

2014-12-16 14:34:32 +01:00

mailers

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

models

Merge branch 'master' into group_membership_lock

2014-12-16 14:34:32 +01:00

services

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

uploaders

Revert "Merge pull request #7349 from srna/patch-1"

2014-12-05 15:33:22 +01:00

views

Merge branch 'master' into group_membership_lock

2014-12-16 14:34:32 +01:00

workers

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00