Merge branch 'develop' into migrate-to-angular-cli

This commit is contained in:
Manuel Friedli 2017-07-25 20:35:20 +02:00
commit 8c119a55e9
43 changed files with 1455 additions and 1094 deletions

1
.gitignore vendored
View file

@ -41,3 +41,4 @@ testem.log
# System Files
.DS_Store
Thumbs.db
*~