fetsite

Files

Thomas Blazek 1db27955de Merge branch 'master' of https://github.com/andreassteph/fetsite

Conflicts:
	config/routes.rb

2013-08-19 15:47:12 +02:00

attachments_controller_spec.rb

2013-08-05 18:31:04 +02:00

calendars_controller_spec.rb

2013-08-06 00:48:45 +02:00

calentries_controller_spec.rb

2013-08-06 00:48:45 +02:00

fetprofiles_controller_spec.rb

a lot of new models ...

2013-08-19 15:39:56 +02:00

fetzneditions_controller_spec.rb

fetzneditions

2013-08-19 15:42:08 +02:00

fotos_controller_spec.rb

a lot of new models ...

2013-08-19 15:39:56 +02:00

fragen_controller_spec.rb

2013-08-05 18:31:04 +02:00

galleries_controller_spec.rb

a lot of new models ...

2013-08-19 15:39:56 +02:00

gremien_controller_spec.rb

a lot of new models ...

2013-08-19 15:39:56 +02:00

lecturers_controller_spec.rb

Introducing Lecturers

2013-08-19 15:43:54 +02:00

memberships_controller_spec.rb

a lot of new models ...

2013-08-19 15:39:56 +02:00

themen_controller_spec.rb

2013-08-05 18:31:04 +02:00

themengruppen_controller_spec.rb

2013-08-05 18:31:04 +02:00