problems with rspec
problems with rspec
conflict
irritating merge conflicts
Merge branch 'master' of https://github.com/Groarq/tablica
conflict
Merge branch 'master' of https://github.com/Groarq/tablica
Rspec holiday controll
Rspec holiday controll
Merge branch 'master' of https://github.com/Groarq/tablica into Holiday_Controller

Conflicts:
	app/controllers/holidays_controller.rb
conflict
Merge branch 'master' of https://github.com/Groarq/tablica
commit in order to pull
Merge branch 'master' of https://github.com/Groarq/tablica
Corrected added validation datestart<dateend
Added Model Raport and validation
Merge branch 'master' of https://github.com/Groarq/tablica into Raport
Commented line in mime_types.rb
worktime
Modle Raport