Thomas Blazek 88ba8fa1c2 Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar ...

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

2013-08-11 10:34:03 +02:00

..

beispiele

Layout changes

2013-08-10 02:03:45 +02:00

calendars

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

2013-08-11 01:17:37 +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

Init

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

layouts

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

2013-08-11 10:34:03 +02:00

lvas

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

2013-08-11 10:34:03 +02:00

modulgruppen

Modul-show überarbeitet

2013-08-11 00:38:01 +02:00

moduls

Modul-show überarbeitet

2013-08-11 00:38:01 +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 'kalender' of https://github.com/andreassteph/fetsite into calendar

2013-08-11 10:34:03 +02:00

users

Init

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