Skip to content

Commit

Permalink
Merged hotfix/1.5.3 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
polosson committed Feb 12, 2017
2 parents 9a4dccb + c42c5f7 commit 5ea1cd4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 1,126 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,6 @@
v 1.5.3
- HotFix: using new paths of src in example

v 1.5.2
- HotFix: updated bower.json release version

Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "plantt",
"version": "1.5.2",
"version": "1.5.3",
"description": "AngularJS module : Simple scheduler on a timeline",
"authors": [
"Polosson <polo@polosson.com"
Expand Down
4 changes: 2 additions & 2 deletions index.html
Expand Up @@ -10,7 +10,7 @@
<link href="example/css/vendor/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="example/css/vendor/highlight-github.css" rel="stylesheet" type="text/css" />
<link href="example/css/example.css" rel="stylesheet" type="text/css" />
<link href="src/css/plantt.css" rel="stylesheet" type="text/css" />
<link href="src/plantt.css" rel="stylesheet" type="text/css" />

<script src="example/js/vendor/angular-1.5.8.min.js"></script>
<script src="example/js/vendor/angular-locale_fr-fr.js"></script>
Expand Down Expand Up @@ -861,7 +861,7 @@ <h4>Events</h4>
</section>
</div>

<script src="src/js/plantt.js"></script>
<script src="src/plantt.js"></script>
<script src="example/js/example.js"></script>

</body>
Expand Down
228 changes: 0 additions & 228 deletions src/css/plantt.css

This file was deleted.

0 comments on commit 5ea1cd4

Please sign in to comment.