diff options
| author | Friendika <info@friendika.com> | 2011-02-05 13:01:28 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-05 13:01:28 -0800 |
| commit | c26463b65b4b98f9aca77781fd74a7fe99f73814 (patch) | |
| tree | 341d42356870f767cb6711ddf274f9e7665af096 /view/fr/settings.tpl | |
| parent | 8cced061bba8d5ef18e2fa5ead0edcdc90d06e73 (diff) | |
| parent | c4ddee005ebcf912c913e12a17e65ab8826650a6 (diff) | |
| download | volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.tar.gz volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.tar.bz2 volse-hubzilla-c26463b65b4b98f9aca77781fd74a7fe99f73814.zip | |
Merge branch 'omigeot-master'
Conflicts:
view/fr/strings.php
Diffstat (limited to 'view/fr/settings.tpl')
0 files changed, 0 insertions, 0 deletions