just improving git configuration
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
Changed things in user controller and view
unaccepted user authentication
Merge branch 'master' of https://github.com/Groarq/tablica
Fixed some problems
fixed problems
Merge branch 'master' of https://github.com/Groarq/tablica
Added make admin column to users list
Merge branch 'master' of https://github.com/Groarq/tablica
link to users list on profile page and fixed errors
flash
Merge branch 'master' of https://github.com/Groarq/tablica
Added make admin in users controller and view
Added route to make_admin in routes.rb
unactivated user flash fix
DefaultWorkTime-requests
Fixed some labels in users list view
Merge branch 'master' of https://github.com/Groarq/tablica