diff options
| author | Sem <sembrestels@riseup.net> | 2013-02-13 20:03:50 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-02-13 20:03:50 +0100 |
| commit | 9ae3522b674a311e963b07513e4eee3c4729d2cd (patch) | |
| tree | 2f62765c7c53ddacb35c7ac8034cfb9867b33fd5 /views/default/forms/plugins/usersettings/save.php | |
| parent | 5aff5b3913fbb6226d8fb3162453c58888fba38d (diff) | |
| parent | b3b12344bfee097b06019d6ee83b1952cb3088ea (diff) | |
| download | elgg-9ae3522b674a311e963b07513e4eee3c4729d2cd.tar.gz elgg-9ae3522b674a311e963b07513e4eee3c4729d2cd.tar.bz2 | |
Merge branch 'messages-reply' of git://github.com/sembrestels/Elgg into foxglove-2
Conflicts:
mod/messages/pages/messages/read.php
Diffstat (limited to 'views/default/forms/plugins/usersettings/save.php')
0 files changed, 0 insertions, 0 deletions