]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71edfd8 4dd2ca9)
Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into...
authorSem <sembrestels@riseup.net>
Fri, 3 Aug 2012 23:50:01 +0000 (01:50 +0200)
committerSem <sembrestels@riseup.net>
Fri, 3 Aug 2012 23:50:01 +0000 (01:50 +0200)
Conflicts:
mod/developers/views/default/theme_preview/grid.php


Trivial merge
Social Networking Engine