Merge from booking branch

This commit is contained in:
2015-11-17 22:22:59 +01:00
parent 25906d0227
commit 9a2652739b
266 changed files with 12929 additions and 2433 deletions

4
.gitignore vendored
View File

@ -10,7 +10,11 @@ dist
bower_components
node_modules
svg
web/Web.config.prod
web/Web.config.dev
.nuget
.gitignore
web/bfiles
web/App_Themes/style.totem.css