Andreas Stephanides 4aca98c0f5 Merge remote-tracking branch 'thomasb/master' ...

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb

2013-08-12 11:11:59 +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 remote-tracking branch 'thomasb/master'

2013-08-12 11:11:59 +02:00

seeds.rb

Init

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

sqlite3.exe

Init

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