First appearance of page History (modified:   src/urls.py,history/views.py, new files:history/urls.py,src/templates/history/index.html)
Merge branch 'master' into history
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history
added file
deleted a file Безымянный документ
created a dashboard.css for our dashboard template and modified base.html to attach this css to dashboard template
"comment"
under development
changed views and templates
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history
s.products.all added into template. Changed views.py and history/index.html
Merge branch 'master' of https://github.com/Alerion/shopping-helper into dashboard
resolved conflit
resolve conflict
Merge branch 'master' into history
Merge branch 'master' of https://github.com/Alerion/shopping-helper into dashboard
addedcategories menu and css file
realy added css file
Merge branch 'master' of https://github.com/Alerion/shopping-helper into dashboard
Merge branch 'master' into history