]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Merge branch '1.8' of gitorious.org:lorea/colorbox into 1.8
authorSem <sembrestels@riseup.net>
Fri, 23 Aug 2013 03:28:41 +0000 (23:28 -0400)
committerSem <sembrestels@riseup.net>
Fri, 23 Aug 2013 03:28:41 +0000 (23:28 -0400)
1  2 
views/default/js/embed/embed.php

Simple merge