Andres Keskküla 7a9af5a719 Merge branch 'master' of github.com:internetee/registry ... Conflicts: app/models/contact.rb		2014-08-22 11:31:02 +03:00
..
epp	Relation check for contact#delete	2014-08-22 11:25:25 +03:00
layouts	User interface for the registry along with basic settings	2014-08-15 14:45:53 +03:00
setting_groups	Add statuses to domain	2014-08-19 13:43:01 +03:00