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
..
2014-10-17 10:17:22 +02:00
2014-06-09 23:14:05 +05:30
2014-07-09 20:18:07 +02:00
2014-06-10 18:47:16 +05:30
2014-04-23 17:15:59 +02:00
2014-10-17 10:17:22 +02:00
2014-12-16 09:00:43 +01:00
2014-10-17 10:17:22 +02:00
2014-10-21 13:29:14 +02:00
2014-06-09 23:14:05 +05:30
2014-06-21 16:36:30 +05:30
2014-06-20 00:15:45 +05:30
2014-02-16 15:34:16 +01:00
2013-08-05 18:31:04 +02:00
2014-07-03 21:31:27 +05:30
2014-10-17 10:17:24 +02:00
2014-05-02 18:55:38 +02:00
2014-06-28 18:11:46 +05:30
2014-06-09 23:14:05 +05:30