added holidays and fixed a bug
conflict?
works again
gemfile.lock after bundle update
settings works - vacation missing
vacation on the way
vacation works!
done?
so...
assets
Merge branch 'release/1.0'