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

..

_document.html.erb

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

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

_nested_form.html.erb

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

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

create.js.erb

meeting views

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

destroy.js.erb

documents

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

edit.html.erb

meeting views

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

edit.js.erb

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

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

new.js.erb

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

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

show.html.erb

meeting views

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

update.js.erb

documents

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