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

..

environments

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

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

initializers

Init

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

locales

Merge remote-tracking branch 'thomasb/master'

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

application.rb

Init

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

boot.rb

Init

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

database.yml

Init

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

environment.rb

Init

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

routes.rb

Merge remote-tracking branch 'thomasb/master'

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

routes.rb.save

Routes Änderung

2013-07-25 16:55:51 +02:00

tinymce.yml

Init

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