This commit is contained in:
Remco
2014-10-16 20:04:20 +02:00
2 changed files with 26 additions and 0 deletions

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
# transfer.sh
@ -6,3 +7,7 @@ Development
- grunt serve
- grunt build
=======
transfer.sh
===========
>>>>>>> 7a208c9efbfc3f0a063bff4edf43fbbf76e1371f