Commit Graph

6 Commits

Author SHA1 Message Date
vv01f 935c489845 removed false friend xhtml5.xml from news files 2014-02-28 03:20:35 +01:00
vv01f aaa456fe0e reference on html.xml replaces with xhtml5.xml 2014-02-27 18:21:07 +01:00
Astro 0e79961dee news/event-*: link location GCHQ to space.html 2014-01-03 23:16:49 +01:00
koeart 0da8345e34 Merge branch 'master' of git://git.c3d2.de/c3d2-web
Conflicts:
	content/news/event-20131221-palava.xml
2013-12-21 18:21:20 +01:00
koeart e4b7e40451 news/event-20131221-palava 2013-12-18 23:52:30 +01:00
koeart 375560aee3 palava event sat 21.12.2013 added 2013-12-18 22:45:46 +01:00