Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/kotlin/nl/astraeus/komp/todo/Todo.kt
commit 60381af65f0f45dc1310a438ee842cc552994612
2 parents 221465b + d770aa8
rnentjes authored on 29 Apr 2017
Showing 6 changed files
View
komp-todo.ipr
View
src/main/kotlin/nl/astraeus/komp/todo/Todo.kt
View
web/index.html
View
web/js/kotlin/komp-todo.js
View
web/js/kotlin/komp-todo.js.map
View
web/js/kotlin/komp-todo.meta.js