website/template/pages/vokue, branch statusscript The code for sublab.org Remove vokue page, it's in the wiki now 2013-06-19T23:23:12+00:00 Christian Franke nobody@nowhere.ws 2013-06-19T23:23:12+00:00 15fb6f7b6e4f6f6a071af9e794ccf80a8f804d8a 






Revert "Merge branch 'master' of sublab.org:website"
2012-02-03T01:06:37+00:00

Christian Franke
nobody@nowhere.ws

2012-02-03T01:06:37+00:00

c1fe26e9c3a1f6d26ff5b653150deacf56c45b7c

This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing
changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f.

Conflicts:

	template/topic/topic

Guys, please learn how to use git. Have a look at

    $ git diff origin/master master

and check if it looks reasonable. Also, if there is a merge in the
history, in our case, it is almost always bad. When you pull, use

    $ git pull --rebase --ff-only

and not just a pull without arguments.





This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing
changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f.

Conflicts:

	template/topic/topic

Guys, please learn how to use git. Have a look at

    $ git diff origin/master master

and check if it looks reasonable. Also, if there is a merge in the
history, in our case, it is almost always bad. When you pull, use

    $ git pull --rebase --ff-only

and not just a pull without arguments.







Merge branch 'master' of sublab.org:website
2012-02-02T20:56:19+00:00

kloschi klosch
klosch@netresearch.de

2012-02-02T20:56:19+00:00

76f5eb72cda67da497ea4ba992778661559f26b4

Conflicts:
	public/img/onewire/digitemp.jpg
	template/news/2011-12-07-frieren.html
	template/pages/projekte/content.html
	template/pages/verein/content.html
	template/pages/vokue/content.html
	template/template/template.html
	template/topic/topic





Conflicts:
	public/img/onewire/digitemp.jpg
	template/news/2011-12-07-frieren.html
	template/pages/projekte/content.html
	template/pages/verein/content.html
	template/pages/vokue/content.html
	template/template/template.html
	template/topic/topic







added phantomspeisung projekte page
2012-01-12T10:59:29+00:00

Florian
florianraemisch@web.de

2011-12-18T22:48:41+00:00

c3d6b9b323cc13875e021c2f9040098f1785cb04












moved phantomspeisung page to exploit rewrite rule on server
2012-01-12T10:58:55+00:00

Florian
florianraemisch@web.de

2011-12-03T23:31:12+00:00

c2b1eb48ccbd823c146d27a3fd52e44a53c47c21












moved phantomspeisung page to exploit rewrite rule on server
2011-12-03T23:31:12+00:00

Florian
florianraemisch@web.de

2011-12-03T23:31:12+00:00

b64bcae21c5656efb0801ac5fe184d73ab63a707