Commit Graph

6 Commits

Author SHA1 Message Date
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
Thomas Blazek
cd14b0dd52 Layout kleinigkeiten 2013-08-11 00:37:13 +02:00
Andreas Stephanides
116446ff63 merge layout formular moduls & studien 2013-08-10 14:29:36 +02:00
Thomas Blazek
9bf4768e09 Form designs 2013-08-09 18:49:56 +02:00
Thomas Blazek
cc002d4291 Init 2013-07-22 15:49:19 +02:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00