Thomas Blazek af2406b4a1 Merge branch 'master' into calendar ...

Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb

2013-08-11 11:44:58 +02:00

..

migrate

Calendar Klasse überarbeitet Views,gefixt, Pictures hinzugefügt

2013-08-11 01:17:37 +02:00

development

Init

2013-07-22 15:49:19 +02:00

schema.rb

Merge branch 'master' into calendar

2013-08-11 11:44:58 +02:00

seeds.rb

Init

2013-07-22 15:49:19 +02:00

sqlite3.exe

Init

2013-07-22 15:49:19 +02:00