Andreas Stephanides 28dd49bbee Merge branch 'master' of github.com:fetsite/fetsite ...

Conflicts:
	Gemfile.lock

2014-02-23 14:30:26 +01:00

..

environments

fixes for new server

2014-02-22 19:00:03 +01:00

initializers

fixes for new server

2014-02-22 19:00:03 +01:00

locales

upload beispiele attachments...

2014-02-20 10:50:03 +01:00

application.rb

Themen und themes_for_rails neues design

2014-01-08 20:23:58 +01:00

boot.rb

Init

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

database.yml

fixes for new server

2014-02-22 19:00:03 +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

upload beispiele attachments...

2014-02-20 10:50:03 +01: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