Naeltard 57ddfd103c Merge branch 'master' of mojotrollz.eu:hosting ...

Conflicts:
	slingit/slingit/page/page_slingit.php

2015-04-08 16:07:01 +02:00

..

default_about

states for about and impressum, cleanup

2015-04-01 23:47:34 +02:00

default_impressum

states for about and impressum, cleanup

2015-04-01 23:47:34 +02:00

default_page

about and impressum repopup on double tap the link works now,meta tags, updated system reference

2015-04-06 17:23:36 +02:00

default_start

Merge branch 'master' of mojotrollz.eu:hosting

2015-04-08 16:07:01 +02:00

default_status

merge

2015-04-08 16:06:01 +02:00

autoload.inc

merge

2015-04-08 16:06:01 +02:00

page_slingit.php

merge

2015-04-08 16:06:01 +02:00