3036: Fix merge conflicts. One python sdk test still fails.
[arvados.git] / services / api / db / migrate / 20130626002829_add_is_active_to_users.rb
2013-06-26 Tom Cleggadd user#is_active flag