Merge branch 'master' into development
No related branches found
No related tags found
Showing
- SciPost_v1/settings/base.py 1 addition, 0 deletionsSciPost_v1/settings/base.py
- SciPost_v1/urls.py 1 addition, 0 deletionsSciPost_v1/urls.py
- news/templates/news/news_card_content_for_api.html 1 addition, 1 deletionnews/templates/news/news_card_content_for_api.html
- news/templates/news/news_card_content_short.html 1 addition, 1 deletionnews/templates/news/news_card_content_short.html
- partners/admin.py 1 addition, 0 deletionspartners/admin.py
- partners/migrations/0033_auto_20171003_2058.py 27 additions, 0 deletionspartners/migrations/0033_auto_20171003_2058.py
- partners/migrations/0034_auto_20171003_2109.py 20 additions, 0 deletionspartners/migrations/0034_auto_20171003_2109.py
- partners/migrations/0035_merge_20171004_0848.py 16 additions, 0 deletionspartners/migrations/0035_merge_20171004_0848.py
- partners/migrations/0036_auto_20171004_2014.py 22 additions, 0 deletionspartners/migrations/0036_auto_20171004_2014.py
- partners/models.py 1 addition, 0 deletionspartners/models.py
- partners/templates/partners/supporting_partners.html 23 additions, 0 deletionspartners/templates/partners/supporting_partners.html
- petitions/__init__.py 0 additions, 0 deletionspetitions/__init__.py
- petitions/admin.py 17 additions, 0 deletionspetitions/admin.py
- petitions/apps.py 5 additions, 0 deletionspetitions/apps.py
- petitions/forms.py 10 additions, 0 deletionspetitions/forms.py
- petitions/managers.py 9 additions, 0 deletionspetitions/managers.py
- petitions/migrations/0001_initial.py 50 additions, 0 deletionspetitions/migrations/0001_initial.py
- petitions/migrations/0002_auto_20171004_2107.py 19 additions, 0 deletionspetitions/migrations/0002_auto_20171004_2107.py
- petitions/migrations/0003_auto_20171004_2139.py 30 additions, 0 deletionspetitions/migrations/0003_auto_20171004_2139.py
- petitions/migrations/0004_petition_preamble.py 20 additions, 0 deletionspetitions/migrations/0004_petition_preamble.py
Loading
Please register or sign in to comment