b3yond f360c4f8fd Merge remote-tracking branch 'origin/multi-deployment' into multi-deployment ... # Conflicts: # template/settings.tpl		2018-09-15 19:20:25 +02:00
..
city.tpl	finished #23 code. rw city page info display. Unsubscribe = Delete	2018-09-08 11:14:00 +02:00
login-plain.tpl	start refactoring web-frontend.	2018-03-22 02:23:31 +01:00
login.tpl	start refactoring web-frontend.	2018-03-22 02:23:31 +01:00
mail.tpl	finished #23 code. rw city page info display. Unsubscribe = Delete	2018-09-08 11:14:00 +02:00
propaganda.tpl	finished #23 code. rw city page info display. Unsubscribe = Delete	2018-09-08 11:14:00 +02:00
register-plain.tpl	You can now set data for the city page. #22	2018-05-25 14:44:45 +02:00
register.tpl	start refactoring web-frontend.	2018-03-22 02:23:31 +01:00
settings.tpl	Merge remote-tracking branch 'origin/multi-deployment' into multi-deployment	2018-09-15 19:20:25 +02:00
wrapper.tpl	HTML fixes	2018-08-11 17:19:12 +02:00