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

..

_form.html.erb

a lot of new models ...

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

edit.html.erb

a lot of new models ...

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

index.html.erb

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

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

new.html.erb

a lot of new models ...

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

show.html.erb

design

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