Sebastian Marcet 0d49a5b6cb [smarcet] - #6968
* added preview feature on admin

Conflicts:

	marketplace/code/ui/frontend/DistributionsDirectoryPage.php

Conflicts:

	marketplace/code/ui/admin/MarketPlaceAdminPage.php
	marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
	marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
	marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
2014-11-26 16:29:00 -03:00
..
2014-11-24 13:34:20 -03:00
2014-10-31 16:21:41 -03:00
2014-11-26 16:29:00 -03:00