Thomas Blazek bb3229e826 Merge branch 'master' of https://github.com/thisisaname/fetsite ...

Conflicts:
	app/controllers/neuigkeiten_controller.rb
	config/routes.rb

2014-08-27 15:31:52 +02:00

..

environments

Mailer fuer Neuigkeiten added

2014-07-02 12:06:11 +02:00

initializers

größerer Editor

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

locales

voteable

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

application.rb

voteable

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

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 branch 'master' of https://github.com/thisisaname/fetsite

2014-08-27 15:31:52 +02:00

routes.rb.save

Routes Änderung

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

tinymce.yml

Interface fixes icons,colors

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