Commit Graph

58 Commits

Author SHA1 Message Date
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
Andreas Stephanides
5b8b419fa1 resolve config_url problems 2013-02-17 15:46:48 +01:00
Andreas Stephanides
3d60580332 remove GIT part 1 2013-02-17 12:16:44 +01:00
Andreas Stephanides
6acd562297 Link zum Update 2013-02-16 11:39:37 +01:00
Andreas Stephanides
bcc6de5349 Config Controller für Administration 2013-02-16 11:02:47 +01:00
Andreas Stephanides
19b4ed31f4 Beispiele hinzugefügt 2013-02-15 10:48:52 +01:00
Andreas Stephanides
232e6cefff scaffoldsgesäubert 2013-02-12 10:08:44 +01:00
Andreas Stephanides
3d11400d5e GitHub Account angelegt 2013-02-12 02:05:12 +01:00