Commit Graph

3 Commits

Author SHA1 Message Date
HausdorffHimself
c7d63c4c19 Merge branch 'master' of https://github.com/fetsite/fetsite
Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb
2013-08-13 19:05:26 +02:00
Andreas Stephanides
6bb35c110a calendar feature generiert 2013-08-06 00:48:45 +02:00
HausdorffHimself
ac4cb5d0fe New Feature: Themen/Informationen 2013-08-05 18:31:04 +02:00