Andreas Stephanides f17b269458 Merge remote-tracking branch 'remotes/origin/master' ...

Conflicts:
	app/controllers/config_controller.rb
	app/views/config/index.html.erb
	config/routes.rb

2013-02-17 15:57:05 +01:00

..

application_controller.rb

GitHub Account angelegt

2013-02-12 02:05:12 +01:00

beispiele_controller.rb

Beispiele hinzugefügt

2013-02-15 10:48:52 +01:00

config_controller.rb

Merge remote-tracking branch 'remotes/origin/master'

2013-02-17 15:57:05 +01:00

home_controller.rb

GitHub Account angelegt

2013-02-12 02:05:12 +01:00

lvas_controller.rb

scaffoldsgesäubert

2013-02-12 10:08:44 +01:00

modulgruppen_controller.rb

scaffoldsgesäubert

2013-02-12 10:08:44 +01:00

moduls_controller.rb

scaffoldsgesäubert

2013-02-12 10:08:44 +01:00

neuigkeiten_controller.rb

scaffoldsgesäubert

2013-02-12 10:08:44 +01:00

rubriken_controller.rb

kleine Korrektur im Ribrik Controller

2013-02-12 11:18:52 +01:00

semesters_controller.rb

scaffoldsgesäubert

2013-02-12 10:08:44 +01:00

studien_controller.rb

fixed studien Ansicht und Modulgruppen

2013-02-12 23:51:43 +01:00

users_controller.rb

scaffoldsgesäubert

2013-02-12 10:08:44 +01:00