Controler Raport
problems
Merge branch 'master' of https://github.com/Groarq/tablica into pdfthings
Added route to raports index
Merge branch 'master' of https://github.com/Groarq/tablica
conflict
Merge branch 'master' of https://github.com/Groarq/tablica into pdfthings
controler raport add date
Added things in raports view
Conflicts
Conflicts
Changed some files names
Holiday counter
Holiday counter
Merge branch 'master' of https://github.com/Groarq/tablica into pdfthings
Change in Raport controller
Merge branch 'master' of https://github.com/Groarq/tablica into pdfthings
Merge branch 'pdfthings' of https://github.com/Groarq/tablica into pdfthings
git tells me to commit
schema.rb automatically changed