Artur Beljajev be959a8471 Merge branch 'master' into migrate-fabricators-to-factory-bot-factories ... # Conflicts: # Gemfile # lib/tasks/dev.rake # spec/models/contact_spec.rb		2017-11-15 15:42:54 +02:00
..
contact	Merge branch 'master' into migrate-fabricators-to-factory-bot-factories	2017-11-15 15:42:54 +02:00
domain	Replace SERVER_DELETE_PROHIBITED with PENDING_UPDATE on EPP domain:update	2017-05-31 19:48:16 +03:00