comparison db/migrate/.svn/text-base/102_add_custom_fields_editable.rb.svn-base @ 700:c7306033ba7a feature_36

Merge from 699:bd88afe21831
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 19 Sep 2011 16:44:43 +0100
parents 513646585e45
children
comparison
equal deleted inserted replaced
699:2b665b7e67f4 700:c7306033ba7a