Andreas Stephanides f8ad8f4527 Merge remote-tracking branch 'github/master' ...

Conflicts:
	app/models/ability.rb

2013-03-02 20:31:22 +01:00

..

assets

Wiki Erstentwurf,

2013-03-02 14:09:12 +01:00

controllers

Wiki Erstentwurf,

2013-03-02 14:09:12 +01:00

helpers

Wiki Erstentwurf,

2013-03-02 14:09:12 +01:00

inputs

GitHub Account angelegt

2013-02-12 02:05:12 +01:00

mailers

GitHub Account angelegt

2013-02-12 02:05:12 +01:00

models

Merge remote-tracking branch 'github/master'

2013-03-02 20:31:22 +01:00

views

Merge remote-tracking branch 'github/master'

2013-03-02 20:31:22 +01:00