Andreas Stephanides fabf9d26a6 Merge branch 'master' of github.com:andreassteph/fetsite ...

Conflicts:
	app/models/neuigkeit.rb

2013-08-23 12:02:45 +02:00

..

assets

Jquery-upload

2013-08-22 00:08:06 +02:00

controllers

bugfix multiple lines

2013-08-22 13:49:11 +02:00

doc

Testen eines Tests für Modulgruppe

2013-07-25 14:45:29 +02:00

helpers

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

2013-08-19 15:47:12 +02:00

inputs

Calendar Klasse überarbeitet Views,gefixt, Pictures hinzugefügt

2013-08-11 01:17:37 +02:00

mailers

Init

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

models

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

2013-08-23 12:02:45 +02:00

uploaders

Fetprofile, Gremien etc bearbeitet

2013-08-21 19:04:26 +02:00

views

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

2013-08-23 12:02:45 +02:00