Merged with master, resolved conflicts

2015-12-24 02:24:59 -08:00
parent 71febeb71f 69eb62c09f
commit 5877e5e11a
47 changed files with 3876 additions and 2153 deletions
@@ -19,7 +19,8 @@ func AddMigrations(mg *Migrator) {
 	addDashboardSnapshotMigrations(mg)
 	addQuotaMigration(mg)
 	addPluginBundleMigration(mg)
-	addPlaylistMigrations(mg)
+	addSessionMigration(mg)
+  addPlaylistMigrations(mg)
 }

 func addMigrationLogMigrations(mg *Migrator) {