]> gitweb.fluxo.info Git - lorea/elgg.git/commit
Merged [5623]:head from 1.7 to trunk.
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 16 Apr 2010 01:56:18 +0000 (01:56 +0000)
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 16 Apr 2010 01:56:18 +0000 (01:56 +0000)
commitfc5ef85ec2fa45afb44795109899d93329f7b2c4
tree8d8f958ca42012c2ea753136859f54eda7796ab7
parentf29b327342068543b8a2a3f0f487953468f3c9a5
Merged [5623]:head from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5760 36083f99-b078-4883-b0ff-0f9b5a30f544
18 files changed:
_graphics/indicator.gif [new file with mode: 0644]
engine/lib/elgglib.php
mod/categories/actions/save.php
mod/categories/languages/en.php
mod/categories/listing.php [new file with mode: 0644]
mod/categories/settings.php
mod/categories/start.php
mod/categories/views/default/categories.php
mod/categories/views/default/categories/list.php
mod/categories/views/default/categories/settings.php
mod/categories/views/default/categories/view.php
mod/profile/actions/cropicon.php
mod/profile/icondirect.php
mod/profile/start.php
mod/search/search_hooks.php
mod/search/views/default/search/css.php
mod/search/views/default/search/entity.php
mod/thewire/views/rss/object/thewire.php [new file with mode: 0644]