Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable ...

Conflicts:
	CHANGELOG
	VERSION

2014-10-27 12:08:44 +02:00

..

assets

Merge pull request #8114 from cirosantilli/rm-global-avatar-js

2014-10-23 12:07:45 +02:00

controllers

fix for public snippet

2014-10-24 12:52:59 +03:00

finders

internal snippets: fix exposing of title

2014-10-24 19:39:14 +03:00

helpers

Add refactoring for multiple LDAP server support

2014-10-13 13:39:54 +02:00

mailers

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

models

Use allowed slack team name.

2014-10-21 14:35:04 +03:00

services

Merge pull request #8097 from cirosantilli/dry-mentioned-in

2014-10-21 11:39:02 +03:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge pull request #8118 from cirosantilli/user-groups-space-link

2014-10-23 12:06:01 +02:00

workers

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00