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
conflict
Merge branch 'master' of https://github.com/Groarq/tablica
commit in order to pull
Merge branch 'master' of https://github.com/Groarq/tablica
small commit in order to git pull
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
common hours in userscontroller
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
hoursplan and users but still with errors
conflict
def earliest time when user will be at work
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
improvements to hoursplan controller and view but still there are errors