Thomas Blazek 96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar ...

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 13:44:47 +02:00

..

_form.html.erb

Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar

2013-08-12 13:44:47 +02:00

_navigation.html.erb

Bugfixes

2013-08-02 19:08:35 +02:00

_studium.html.erb

Studienansicht neu

2013-08-05 18:24:34 +02:00

_tabs.html.erb

Studienverwaltung

2013-08-07 12:17:05 +02:00

_verwalten_menu.html.erb

Layout changes

2013-08-10 02:03:45 +02:00

edit.html.erb

Toolbar einbindungen

2013-08-02 10:40:22 +02:00

index.html.erb

Studienansicht neu

2013-08-05 18:24:34 +02:00

new.html.erb

Translations for Rubriken

2013-07-22 16:17:30 +02:00

semesteransicht.html.erb

Semesteransicht verbessert

2013-08-11 11:43:06 +02:00

show.html.erb

Studienansicht neu

2013-08-05 18:24:34 +02:00

verwalten.html.erb

Views überarbeitet

2013-08-12 12:49:10 +02:00