George Goldberg 7f266c1951 Merge branch 'release-3.7' into master.

2017-03-17 16:29:26 +00:00

..

account_migration.go

Adding migration support to LDAP from other account types (#3655)

2016-07-26 17:39:51 -04:00

brand.go

Add custom branding functionality (#2667)

2016-04-11 13:45:03 -04:00

cluster.go

Implement GET /logs endpoint for APIv4 (#5778)

2017-03-16 11:59:44 -07:00

compliance.go

PLT-2115 Adding compliance

2016-03-15 18:27:45 -07:00

emoji.go

PLT-3145 Custom Emojis (#3381)

2016-07-05 11:58:18 -04:00

ldap.go

Adding LDAP test connection button. Reordering LDAP settings. (#3912)

2016-09-01 17:05:20 -04:00

metrics.go

Example of how to call metrics (#5621)

2017-03-06 10:15:37 -05:00

mfa.go

EE: PLT-4512 Show secret in addition to QR code when activating MFA (#4427)

2016-11-03 10:41:11 -04:00

oauthproviders.go

Some refactoring

2015-12-16 17:30:15 -05:00

saml.go

PLT-5765 Passed SiteURL to SendNotifications (#5705)

2017-03-10 10:18:18 +00:00