Andreas Stephanides f17b269458 Merge remote-tracking branch 'remotes/origin/master' ...

Conflicts:
	app/controllers/config_controller.rb
	app/views/config/index.html.erb
	config/routes.rb

2013-02-17 15:57:05 +01:00

..

assets

Beispiele hinzugefügt

2013-02-15 10:48:52 +01:00

controllers

Merge remote-tracking branch 'remotes/origin/master'

2013-02-17 15:57:05 +01:00

helpers

Beispiele hinzugefügt

2013-02-15 10:48:52 +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

Beispiele hinzugefügt

2013-02-15 10:48:52 +01:00

views

Merge remote-tracking branch 'remotes/origin/master'

2013-02-17 15:57:05 +01:00