Martin Lensment 3bb80b20d2 Merge branch 'master' of github.com:internetee/registry ... Conflicts: app/views/layouts/application.haml config/locales/en.yml		2014-11-26 15:06:44 +02:00
..
application.haml	Merge branch 'master' of github.com:internetee/registry	2014-11-26 15:06:44 +02:00
client.haml	adde missing translation	2014-11-25 15:57:40 +02:00
login.haml	admin login now honors seed file	2014-11-25 15:28:32 +02:00