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

..

environments

default host für mailer

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

initializers

größerer Editor

2014-05-02 18:55:26 +02:00

locales

Rate Beispiele text

2014-10-21 13:28:59 +02:00

application.rb

removecomments

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

boot.rb

Init

2013-07-22 15:49:19 +02:00

database.yml.example

removed database.yml

2014-03-16 11:23:23 +01:00

environment.rb

voteable

2014-07-21 23:41:44 +05:30

flatfeticon1.yml

design neue Farben & icons

2014-07-05 19:20:47 +05:30

omniauth_secrets.yml.example

omniauth_secrets.example

2013-10-26 14:14:49 +02:00

routes.rb

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

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

routes.rb.save

Routes Änderung

2013-07-25 16:55:51 +02:00

schedule.rb

whenever

2014-12-08 14:58:29 +01:00

sitemap.rb

Merge branch 'master' of github.com:fetsite/fetsite

2014-12-08 17:12:11 +01:00

sunspot.yml

Fix SunSpot and minor fix in calentry

2014-12-02 12:03:14 +01:00

tinymce.yml

Interface fixes icons,colors

2014-07-09 22:44:42 +05:30