website/template/pages/projekte/content.html, branch master

Fix https issues for iframes

2015-03-22T17:20:01+00:00

adapted projekte page

2015-03-15T13:22:56+00:00

Techniksprechstundeseite fuer Projekteseite

2013-10-31T18:43:41+00:00

Fixup typo in link url

2013-06-22T17:08:53+00:00

Remove vokue page, it's in the wiki now

2013-06-19T23:23:12+00:00

added turmuhr projekt to projekte page

2013-04-19T19:50:58+00:00

updated projekte page

2013-04-15T09:46:58+00:00

Add link to aeroponics page

2012-02-22T22:36:58+00:00

Revert "Merge branch 'master' of sublab.org:website"

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

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

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