Thomas Blazek 918a3c9360 Merge branch 'master' of github.com:fetsite/fetsite ...

Conflicts:
	app/views/galleries/index.html.erb

2013-08-27 21:27:05 +02:00

..

application.css.scss

links überarbeitet

2013-08-27 20:44:03 +02:00

attachments.css.scss

New Feature: Themen/Informationen

2013-08-05 18:31:04 +02:00

beispiele.css.scss

Init

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

bootstrap-responsive.scss

Responsive Menubar springt direkt auf 100% Kopfzeile um

2013-08-13 00:07:29 +02:00

calendars.css.scss

calendar feature generiert

2013-08-06 00:48:45 +02:00

calentries.css.scss

calendar feature generiert

2013-08-06 00:48:45 +02:00

fetprofiles.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

fetzneditions.css.scss

fetzneditions

2013-08-19 15:42:08 +02:00

formtastic-changes.css.scss

Beispiel überarbeitungen

2013-08-25 15:16:19 +02:00

fotos.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

fragen.css.scss

New Feature: Themen/Informationen

2013-08-05 18:31:04 +02:00

galleries.css.scss

design

2013-08-27 19:39:00 +02:00

gremien.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

layout.css.scss

Init

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

lecturers.css.scss

Introducing Lecturers

2013-08-19 15:43:54 +02:00

lvas.css.scss

Beispiel überarbeitungen

2013-08-25 15:16:19 +02:00

memberships.css.scss

a lot of new models ...

2013-08-19 15:39:56 +02:00

modulgruppen.css.scss

Init

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

moduls.css.scss

Init

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

neuigkeiten.css.scss

Init

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

rubriken.css.scss

Init

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

scaffolds.css.scss

Init

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

semesters.css.scss

Init

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

studien.css.scss

semester tweaks

2013-08-19 09:11:45 +02:00

themen.css.scss

New Feature: Themen/Informationen

2013-08-05 18:31:04 +02:00

themengruppen.css.scss

CHANGE: keine borders für Themen

2013-08-19 18:51:23 +02:00