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

Browse Source

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

...

This commit is contained in:

Andreas Stephanides

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

parent 565024c282 48e3c1149a

commit 43a551fc28

56 changed files with 1154 additions and 125 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

app/views/layouts/application.html.erb

Binary file not shown.