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

..

controllers

change meetings

2014-08-27 15:22:47 +02:00

factories

change meetings

2014-08-27 15:22:47 +02:00

helpers

change meetings

2014-08-27 15:22:47 +02:00

mailers

Mailer fuer Neuigkeiten added

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

models

change meetings

2014-08-27 15:22:47 +02:00

requests

change meetings

2014-08-27 15:22:47 +02:00

routing

change meetings

2014-08-27 15:22:47 +02:00

views

change meetings

2014-08-27 15:22:47 +02:00

spec_helper.rb

rspec install

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