Martin Lensment 4bf5a968bd Merge branch 'master' into status-refactor ... Conflicts: app/models/domain.rb db/schema.rb		2015-06-16 16:20:59 +03:00
..
admin	Merge branch 'master' into status-refactor	2015-06-16 16:20:59 +03:00
contact_mailer	Add contact email translations #2558	2015-06-03 10:39:07 +03:00
domain_mailer	registrant update change #2557	2015-06-12 19:20:08 +03:00
epp	Fix tests #2623	2015-06-15 16:35:26 +03:00
invoice_mailer	Update translation keys	2015-04-30 18:34:49 +03:00
layouts	Added que #2557	2015-06-12 12:35:50 +03:00
registrant	registrant update change #2557	2015-06-12 19:20:08 +03:00
registrar	Registrar: auth info partially visible #2587	2015-06-16 15:26:05 +03:00
shared	Give more room to actins in admin #2624	2015-06-11 15:42:39 +03:00