Torkel Ödegaard 69d0e82453 Merge branch 'master' into apps ...

Conflicts:
	pkg/services/sqlstore/migrations/migrations.go

2016-01-08 10:20:46 +01:00

..

models.go

feat(apps): minor progress on app meta data

2015-12-22 16:32:17 +01:00

plugins_test.go

really fix unit tests.

2015-11-27 17:17:27 +08:00

plugins.go

Merge branch 'master' into apps

2016-01-08 10:20:46 +01:00