Andres Keskküla d6036d274c Merge branch 'master' of github.com:internetee/registry ... Conflicts: app/views/admin/domains/index.haml		2014-09-25 17:22:46 +03:00
..
admin	Merge branch 'master' of github.com:internetee/registry	2014-09-25 17:22:46 +03:00
client	Merge branch 'master' of github.com:internetee/registry	2014-09-25 17:22:46 +03:00
epp	Merged the address types	2014-09-25 15:27:08 +03:00
layouts	Better flash messages, sessions spec	2014-09-25 16:37:36 +03:00
shared	Domain editing for client	2014-09-23 17:26:38 +03:00