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

..

2003

error fixes

2014-07-14 17:09:26 +02:00

blue1

Fix: Bildergallerie

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

blue2

blue2

2015-01-15 15:20:19 +01:00

darkblue

error fixes

2014-07-14 17:09:26 +02:00

white_1

Interface fixes icons,colors

2014-07-09 22:44:42 +05:30