Andreas Stephanides 881df624b3 Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting ...

Conflicts:
	app/controllers/documents_controller.rb
	app/controllers/meetings_controller.rb
	app/models/ability.rb
	app/models/document.rb
	app/models/meeting.rb
	app/models/meetingtyp.rb
	app/views/documents/_document.html.erb
	app/views/documents/_nested_form.html.erb
	app/views/documents/edit.js.erb
	app/views/documents/new.js.erb
	app/views/meetings/_meeting.html.erb
	app/views/themen/_small.html.erb
	config/routes.rb

2014-12-16 09:00:43 +01:00

..

assets

meetings added, documents added

2014-12-08 22:58:21 +01:00

controllers

Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

2014-12-16 09:00:43 +01:00

doc

Testen eines Tests für Modulgruppe

2013-07-25 14:45:29 +02:00

helpers

meetings added, documents added

2014-12-08 22:58:21 +01:00

inputs

Zeit formatiert

2014-06-21 16:36:30 +05:30

mailers

default host für mailer

2014-10-19 22:16:34 +02:00

models

Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

2014-12-16 09:00:43 +01:00

uploaders

Interface Neuigkeiten & Attachment

2014-10-17 10:17:22 +02:00

views

Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

2014-12-16 09:00:43 +01:00