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

Conflicts:
	app/assets/javascripts/application.js

2014-02-09 23:07:38 +01:00

..

environments

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

2014-02-09 23:07:38 +01:00

initializers

themes fixes and versioning small fix

2014-01-22 12:33:45 +01:00

locales

gremien kategorien wie berufungsgruppen

2013-12-18 09:42:11 +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

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

Gemfile ui fix

2014-02-09 21:23:35 +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