Commit Graph

2 Commits

Author SHA1 Message Date
woutervanwijk
6903cc4237 small updates 2013-11-15 21:19:56 +01:00
woutervanwijk
43d80e9a77 Merge branch 'master' into develop
Conflicts:
webclient/js/functionsvars.js
2013-11-12 20:54:53 +01:00