Thomas Blazek 88ba8fa1c2 Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar ...

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb

2013-08-11 10:34:03 +02:00

2.2 KiB

Executable File

Raw Blame History

View Raw