Andreas Stephanides ae99841306 Merge branch 'master' of https://github.com/fetsite/fetsite ...

Conflicts:
	Gemfile.lock

2013-11-11 20:04:08 +01:00

..

environments

production environment compile online

2013-11-11 20:03:00 +01:00

initializers

add ldap support

2013-10-26 12:48:40 +02:00

locales

Modulgruppe->show fixed

2013-11-06 10:08:52 +01:00

application.rb

disable whitelist protection + seeds

2013-10-28 12:37:34 +01:00

boot.rb

Init

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

database.yml

G

2013-10-28 11:25:29 +01:00

environment.rb

Init

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

omniauth_secrets.yml.example

omniauth_secrets.example

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

routes.rb

add ldap support

2013-10-26 12:48:40 +02:00

routes.rb.save

Routes Änderung

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

tinymce.yml

kein h1 button für tinymce

2013-11-04 18:45:04 +01:00