diff db/migrate/025_add_search_permission.rb @ 1226:d280360758e5 live

Fix dodgy merge, syntax, defaults
author Chris Cannam
date Tue, 12 Mar 2013 15:26:58 +0000
parents 513646585e45
children dffacf8a6908
line wrap: on
line diff