diff options
| author | Friendika <info@friendika.com> | 2011-02-17 14:05:51 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-17 14:05:51 -0800 |
| commit | 0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05 (patch) | |
| tree | 26a8df206e8fbd8f91fd33afb8b62a5c67f72386 /view/fr/settings_nick_unset.tpl | |
| parent | 45bd7d5e290957a6af38cd44a32033938b8ccdb0 (diff) | |
| parent | 9e654f7e5777458941e93b4bfa6de2a11d4374f9 (diff) | |
| download | volse-hubzilla-0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05.tar.gz volse-hubzilla-0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05.tar.bz2 volse-hubzilla-0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05.zip | |
Merge branch 'chriscase-master'
Conflicts:
mod/dfrn_notify.php
Diffstat (limited to 'view/fr/settings_nick_unset.tpl')
0 files changed, 0 insertions, 0 deletions