HausdorffHimself c7d63c4c19 Merge branch 'master' of https://github.com/fetsite/fetsite ...

Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb

2013-08-13 19:05:26 +02:00

..

_link_all.html.erb

Toolbar und kopfzeileneinbindung

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

_pretty_toolbar.html.erb

Layouts

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

_topbar.html.erb

Layouts

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

application.html.erb

Responsive Menubar springt direkt auf 100% Kopfzeile um

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

menu.html.erb

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

2013-08-13 19:05:26 +02:00