Andres Keskküla e991ab36f9 Merge branch 'master' of github.com:internetee/registry ... Conflicts: db/schema.rb		2014-12-18 13:55:37 +02:00
..
admin	Add back admin boolean	2014-12-16 16:15:45 +02:00
epp	Contact statuses and update_contact modified	2014-12-18 13:53:01 +02:00
layouts	Merge branch 'master' of github.com:internetee/registry	2014-11-26 15:06:44 +02:00
shared	Domain editing for client	2014-09-23 17:26:38 +03:00