dates in hedeaders in weekplan
conflict
Merging branches
Merge branch 'holiday'
Merge branch 'master' of git://github.com/Groarq/tablica
week view by people
Merge branch 'master' of https://github.com/Groarq/tablica into layout
secound table
Merge branch 'master' of https://github.com/Groarq/tablica into layout
table
Don't know what is that
Added heroku gem
Merge branch 'master' of https://github.com/Groarq/tablica
UsersController
UsersController
delete old files
Fixed something.
Fixed something.
Merge branch 'master' of https://github.com/Groarq/tablica into layout
nope for turbolink :|