From: Sem Date: Fri, 3 Aug 2012 23:50:01 +0000 (+0200) Subject: Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into... X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=18df06b9cd34c62dd8e9b1dfffd2f75e2815d859;p=lorea%2Felgg.git Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into lorea-preprod Conflicts: mod/developers/views/default/theme_preview/grid.php --- 18df06b9cd34c62dd8e9b1dfffd2f75e2815d859