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
..
2013-08-11 11:34:20 +02:00
2013-08-11 17:05:56 +02:00
2013-08-11 01:17:37 +02:00
2013-07-22 15:49:19 +02:00
2013-07-22 15:49:19 +02:00
2013-08-11 17:06:39 +02:00
2013-08-12 11:11:59 +02:00
2013-08-12 11:11:59 +02:00
2013-08-11 00:38:01 +02:00
2013-08-11 00:38:01 +02:00
2013-07-25 16:59:01 +02:00
2013-07-22 16:17:30 +02:00
2013-08-11 00:35:23 +02:00
2013-08-12 11:11:59 +02:00
2013-07-22 15:49:19 +02:00