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
..
assets	rails new	2014-06-10 11:43:04 +03:00
ext	rubocop update, now it's green	2014-10-10 16:11:28 +03:00
tasks	Removed redundant whois rake tasks	2014-11-21 16:17:13 +02:00