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

..

controllers

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

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

factories

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

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

helpers

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

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

mailers

Mailer fuer Neuigkeiten added

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

models

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

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

requests

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

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

routing

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

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

views

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

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

spec_helper.rb

rspec install

2013-07-26 00:41:21 +02:00