website/template/pages/verein, branch master

medium sublab logo for verein page

2015-03-17T11:15:05+00:00

small buttons on verein page, column wrap fix

2015-03-17T11:10:32+00:00

updated verein page, and splitted into 3 subpages

2015-03-16T16:44:18+00:00

added medien page to verin page

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

h3 -> h2 in vereins page

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

adapted vereinspage to bootstrap

2015-03-15T13:22:48+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

added newline on page 'Verein'

2012-01-29T19:43:43+00:00

added link and file: einzugsermaechtigung.pdf

2012-01-29T19:41:15+00:00