Aarni Halinen d7a3433d2c Merge branch 'feature-contacts' into develop ...

Conflicts:
	webapp/admin.py
	webapp/models.py
	webapp/views.py

2018-05-16 22:49:38 +03:00

..

management

Add translation for role models and remove summary field from PresetRole

2017-10-19 14:25:28 +03:00

migrations

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

static

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

templates

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

__init__.py

Fix pep8 errors

2017-06-08 09:29:27 +03:00

admin.py

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

apps.py

Fix webapp and sikweb py files pep8

2017-09-20 21:15:46 +03:00

forms.py

Move ohlhafv to its own app

2018-01-28 18:54:45 +02:00

models.py

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

tables.py

Move ohlhafv to its own app

2018-01-28 18:54:45 +02:00

tests.py

Fix webapp and sikweb py files pep8

2017-09-20 21:15:46 +03:00

translation.py

Move and rename a lot of stuff into kaehmy app

2018-01-26 01:15:35 +02:00

urls.py

Move ohlhafv to its own app

2018-01-28 18:54:45 +02:00

utils.py

Fix missing settings import

2018-01-30 14:50:32 +02:00

views.py

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00