website/template/news/2011-12-07-frieren.html, branch statusscript The code for sublab.org changed class for newsimages to img-responsive 2015-03-17T10:28:35+00:00 olf olf@subsignal.org 2015-03-17T10:28:35+00:00 655ef713525570b222be1203710733fd6fcc47b3 






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 onewire image to frieren newspost
2012-01-12T10:59:28+00:00

Florian
florianraemisch@web.de

2011-12-15T00:31:44+00:00

d3809d49cf04cf7b7371fffaa74df44676ba81cb












updated frieren news post with hint for status temp graph
2012-01-12T10:59:28+00:00

Florian
florianraemisch@web.de

2011-12-15T00:27:14+00:00

6f0f10019a15182d611a097be7d3a736dc08f1f3












Temperatursensoren
2012-01-12T10:58:55+00:00

Benjamin Kiessling
mittagessen@l.unchti.me

2011-12-07T23:04:13+00:00

af94e7be7890bf786e33e15a6295983339330d47












Temperatursensoren
2011-12-07T23:04:13+00:00

Benjamin Kiessling
mittagessen@l.unchti.me

2011-12-07T23:04:13+00:00

99c1918e204e721daad905e614f89a78bbc37805