Andrii Marynets 303d99d70d Merge branch 'master' into feature/add_google_analytics ... # Conflicts: # datacenterlight/templates/datacenterlight/order_detail.html		2017-07-02 17:56:07 +03:00
..
emails	Refactored user activation html email template to use proper translation and parameters	2017-06-19 12:34:01 +05:30
includes	Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID	2017-06-30 01:23:35 +03:00
base.html	Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID	2017-06-30 01:23:35 +03:00
beta_access.html	Fix conflicts	2017-06-09 16:18:41 -05:00
beta_success.html	Staging fix and cleaned html	2017-06-09 15:37:14 -05:00
index.html	fixed typo and delete .mo	2017-06-14 17:16:43 -05:00
order_detail.html	Merge branch 'master' into feature/add_google_analytics	2017-07-02 17:56:07 +03:00
pricing.html	Fixed DE Typo, and added text in calculator box	2017-06-14 16:51:42 -05:00
success.html	Fix conflicts	2017-06-09 16:18:41 -05:00