Andreas Stephanides 43a551fc28 Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery ...

Conflicts:
	app/views/layouts/application.html.erb

2015-01-15 15:40:36 +01:00

..

_link_all.html.erb

Toolbar und kopfzeileneinbindung

2013-08-02 15:00:58 +02:00

_login.html.erb

document/meeting updates

2015-01-03 10:06:58 +01:00

_pretty_toolbar.html.erb

rechte für actions versions neuigkeiten

2014-10-19 19:49:33 +02:00

_topbar.html.erb

Layouts

2013-08-05 08:36:16 +02:00

application.html.erb

Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery

2015-01-15 15:40:36 +01:00

menu.html.erb

Sprache/Login im Menü rechtsbündig

2015-01-05 18:37:05 +01:00