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

..

images

CHANGE: Attachment-Einbindung in TinyMCE mit Thumbnails und eigenem Partial-View

2013-08-27 18:35:50 +02:00

javascripts

FIX: downcase in JS

2013-08-27 18:34:02 +02:00

stylesheets

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

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