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

..

base.html

Remove references to deleted css files

2018-02-22 16:31:12 +02:00

contact.html

Merge branch 'feature-contacts' into develop

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

event_calendar.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

footer.html

Revert deletion on footer-padder element

2018-02-22 01:43:15 +02:00

freshmen.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

guild.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

header.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

index.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

international.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

jobs.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00

navigation.html

Remove references to deleted css files

2018-02-22 16:31:12 +02:00

sosso.html

Restructure webapp and infoscreen

2018-01-28 20:23:56 +02:00