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
..
2013-07-22 15:49:19 +02:00
2014-12-16 09:00:43 +01:00
2014-10-17 10:17:22 +02:00
2013-08-05 18:31:04 +02:00
2014-10-17 10:17:24 +02:00
2013-11-13 12:50:04 +01:00
2014-12-14 21:30:09 +01:00
2014-12-16 09:00:43 +01:00
2014-12-02 23:29:19 +01:00
2013-08-23 12:01:14 +02:00
2013-08-23 12:01:14 +02:00
2013-08-23 12:01:14 +02:00
2013-08-06 02:06:48 +02:00
2014-12-14 21:30:09 +01:00
2014-12-14 21:30:09 +01:00
2014-03-16 11:19:10 +01:00
2014-12-14 21:30:09 +01:00
2013-08-05 18:31:04 +02:00
2014-12-16 09:00:43 +01:00
2014-12-16 09:00:43 +01:00
2014-10-17 10:17:23 +02:00
2014-11-28 14:27:44 +01:00
2014-11-28 14:27:44 +01:00
2013-08-05 18:31:04 +02:00
2014-12-14 21:30:21 +01:00
2014-10-19 21:04:38 +02:00
2013-07-23 13:50:03 +02:00
2014-12-14 21:30:21 +01:00
2014-03-16 14:24:43 +01:00
2014-12-14 21:30:21 +01:00
2014-12-08 22:58:21 +01:00
2013-08-06 02:06:48 +02:00
2014-11-28 14:27:44 +01:00
2013-08-06 02:06:48 +02:00
2014-10-19 15:44:19 +02:00