Thomas Blazek 96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar ...

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 13:44:47 +02:00

..

migrate

Merge branch 'master' into calendar

2013-08-12 13:31:47 +02:00

development

Init

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

schema.rb

Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar

2013-08-12 13:44:47 +02:00

seeds.rb

Init

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

sqlite3.exe

Init

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