Merge branch 'dev'
Conflicts: .gitignore manage.py requirements.txt
Showing
.bowerrc
0 → 100644
INSTALL
0 → 100644
bower.json
0 → 100644
core/__init__.py
0 → 100644
core/admin.py
0 → 100644
core/migrations/__init__.py
0 → 100644
core/models.py
0 → 100644
core/static/.gitignore
0 → 100644
core/static/css/base.css
0 → 100644
core/static/css/reset.css
0 → 100644
File added
This source diff could not be displayed because it is too large. You can view the blob instead.
File added
File added
File added
This diff is collapsed.
File added
File added
File added
This diff is collapsed.
File added
File added
core/templates/base.html
0 → 100644
core/tests.py
0 → 100644
core/urls.py
0 → 100644
core/utils.py
0 → 100644
core/views.py
0 → 100644
legislature/__init__.py
0 → 100644
legislature/admin.py
0 → 100644