comparison db/migrate/.svn/text-base/033_add_timelog_permissions.rb.svn-base @ 580:22262ff56e84 feature_36

Merge from 579:c8552c08687f
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 10 Aug 2011 16:20:40 +0100
parents 513646585e45
children
comparison
equal deleted inserted replaced
579:2ada25d4b0a8 580:22262ff56e84