andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,052 Commits 7 Branches 0 Tags
81f1db8ff683e8616435c61330a58b8e0c613957
Commit Graph

4 Commits

Author SHA1 Message Date
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
Andreas Stephanides
ab396c002e meeting views 2014-12-08 22:58:21 +01:00
Andreas Stephanides
c2ea1782ff documents 2014-12-08 22:58:21 +01:00
Andreas Stephanides
65cb400126 documents 2014-11-20 11:40:49 +01:00