Thomas Waldmann 077b91c0dd Merge branch 'pu_translations' of github.com:mandrag0ra/nsupdate.info into mandrag0ra-pu_translations ...

Conflicts:
	nsupdate/main/templates/main/includes/tabbed_router_configuration.html
	nsupdate/main/templates/main/status.html
	nsupdate/templates/base.html

2014-06-06 22:46:32 +02:00

..

includes

correct presumed latest syntax errors

2014-05-30 14:55:50 +02:00

base.html

Merge branch 'pu_translations' of github.com:mandrag0ra/nsupdate.info into mandrag0ra-pu_translations

2014-06-06 22:46:32 +02:00