]> gitweb.fluxo.info Git - lorea/elgg.git/commit
Merge r6301:6338 from 1.7 to trunk.
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 4 Jun 2010 15:36:36 +0000 (15:36 +0000)
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 4 Jun 2010 15:36:36 +0000 (15:36 +0000)
commitf4b1ebbe468e295d59bf7285b335aa51bcf132bb
tree517ed7919069d8a6c3fb34235b048a2bbab91e98
parent559cae5d9035f65f12c1cc25cffe05880a2734c4
Merge r6301:6338 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6356 36083f99-b078-4883-b0ff-0f9b5a30f544
engine/lib/elgglib.php
engine/lib/upgrades/2010060101.php [new file with mode: 0644]
engine/start.php
mod/defaultwidgets/views/default/defaultwidgets/editor.php
mod/notifications/start.php
mod/profile/views/default/profile/icon.php
simplecache/view.php
upgrade.php
version.php
views/default/canvas/layouts/widgets.php