Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0

This commit is contained in:
Sebastiaan Janssen
2015-12-07 10:26:26 +01:00
2 changed files with 3 additions and 2 deletions

View File

@@ -33,7 +33,8 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
"Umbraco has been around since 2005, that's a looong time in IT",
"More than 400 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='http://codegarden15.com'>CodeGarden</a>",
"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
"You can extend Umbraco without modifying the source code and using either JavaScript or C#"
"You can extend Umbraco without modifying the source code and using either JavaScript or C#",
"Umbraco was installed in more than 165 countries in 2015"
];
/**

View File

@@ -32,7 +32,7 @@
ng-click="deleteTemplate($index)"><localize key="general_delete" /></a>
</div>
<br style="clear: both"
<br style="clear: both" />
</li>
</ul>