Vladimir Krylov 0a5428f2ee Merge remote-tracking branch 'origin/master' into 113524121-legal_doc_min_size ... # Conflicts: # public/assets/.sprockets-manifest-48c2dd3ff16b86b70040480e74a50543.json # public/assets/registrant-manifest.js # public/assets/registrar-manifest.css # public/assets/registrar-manifest.js # public/assets/registrar/application.js		2016-03-16 15:09:35 +02:00
..
admin	Merge pull request #101 from internetee/story/113066359-optimization	2016-03-10 13:22:54 +02:00
epp	Story #110211760 - ensure that upDate is not shown when domain has not changed since creation	2015-12-17 11:27:06 +02:00
for_models	111297422-whitespaces	2016-01-13 15:54:30 +02:00
layouts	Add registrar dashboard #2713	2015-09-15 11:49:18 +03:00
mailers	111068694-template_changes	2016-01-07 19:08:49 +02:00
registrant	105842700-routes_fix	2016-01-25 17:53:38 +02:00
registrar	Story#113524121 - we have new rails, so we should use data-legal-document	2016-03-07 12:23:19 +02:00
shared	Admin contact statuses management #2477	2015-07-22 13:37:30 +03:00