Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev

Conflicts:
	airtime_mvc/build/sql/defaultdata.sql
This commit is contained in:
Duncan Sommerville 2015-09-29 11:37:53 -04:00
commit 99a5f7facb

View file

@ -384,7 +384,7 @@ ALTER TABLE cc_pref ALTER COLUMN subjid SET DEFAULT NULL;
CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL;
ANALYZE cc_pref; -- this validates the new partial index
-- end added in 2.5.14
--end added in 2.5.14
-- For now, just needs to be truthy - to be updated later; we should find a better way to implement this...
INSERT INTO cc_pref("keystr", "valstr") VALUES('whats_new_dialog_viewed', 1);