Andreas Stephanides 4aca98c0f5 Merge remote-tracking branch 'thomasb/master' ...

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

2013-08-12 11:11:59 +02:00

..

_form.html.erb

CSS changes

2013-08-10 22:47:32 +02:00

_lva_semester.html.erb

CSS changes

2013-08-10 22:47:32 +02:00

_lva.html.erb

Introducing Semesters

2013-07-29 17:47:44 +02:00

edit.html.erb

Init

2013-07-22 15:49:19 +02:00

index.html.erb

div-layouts+bugfixes

2013-08-05 09:57:44 +02:00

new.html.erb

Init

2013-07-22 15:49:19 +02:00

show.html.erb

Merge remote-tracking branch 'thomasb/master'

2013-08-12 11:11:59 +02:00