diff options
| author | Friendika <info@friendika.com> | 2011-03-24 04:36:53 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-03-24 04:36:53 -0700 |
| commit | 067626380db6d5ed71d68bd91481ff51cfa76915 (patch) | |
| tree | 15b24c4718891a5a8fbaa0ce9964b0714524c6ed /include/pgettext.php | |
| parent | 51447932f707e1d0177ee4700266285ed80be2f6 (diff) | |
| parent | ba99ce3d0ab77bd62971cd3962d964be1ddee205 (diff) | |
| download | volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.tar.gz volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.tar.bz2 volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.zip | |
Merge branch 'erikl-master'
Conflicts:
view/sv/insecure_net.tpl
view/sv/jot-header.tpl
view/sv/msg-header.tpl
view/sv/profile_edit.tpl
view/sv/profile_tabs.tpl
view/sv/strings.php
Diffstat (limited to 'include/pgettext.php')
0 files changed, 0 insertions, 0 deletions