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

..

beispiele

lva view tweaks

2013-08-11 11:34:20 +02:00

calendars

Kleine Anpassungen Calentry

2013-08-11 17:05:56 +02:00

calentries

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

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

config

Init

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

devise

Init

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

home

Link ->Issues für Startseite

2013-08-11 17:06:39 +02:00

layouts

Merge remote-tracking branch 'thomasb/master'

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

lvas

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

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

modulgruppen

Views überarbeitet

2013-08-12 12:49:10 +02:00

moduls

Views überarbeitet

2013-08-12 12:49:10 +02:00

neuigkeiten

Localization

2013-07-25 16:59:01 +02:00

rubriken

Translations for Rubriken

2013-07-22 16:17:30 +02:00

semesters

Semesters edit überarbeitet

2013-08-11 00:35:23 +02:00

studien

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

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

users

Init

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