]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow...
authorCash Costello <cash.costello@gmail.com>
Fri, 24 Jun 2011 11:13:18 +0000 (07:13 -0400)
committerCash Costello <cash.costello@gmail.com>
Fri, 24 Jun 2011 11:13:18 +0000 (07:13 -0400)
Conflicts:
languages/en.php

1  2 
languages/en.php
mod/groups/languages/en.php
mod/groups/start.php
mod/thewire/languages/en.php

Simple merge
Simple merge
Simple merge
Simple merge