Thomas Blazek 79ba089b70 Merge branch 'master' of https://github.com/Inachos/fetsite ...

Conflicts:
	Gemfile.lock
	config/routes.rb

2015-01-11 22:18:05 +01:00

..

environments

configuration for production

2015-01-03 10:52:34 +01:00

initializers

configuration for production

2015-01-03 10:52:34 +01: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 branch 'master' of https://github.com/Inachos/fetsite

2015-01-11 22:18:05 +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

configuration for production

2015-01-03 10:52:34 +01:00

tinymce.yml

updated tinymce config

2014-12-17 16:41:33 +01:00