aboutsummaryrefslogtreecommitdiffstats
path: root/view/de/messages.po
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-06-03 04:59:07 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-06-03 04:59:07 -0400
commit598a2563e844477de2f688663c7c46962b26b602 (patch)
tree525a6536b6ab7f9020e83daf9287c785303ad584 /view/de/messages.po
parent8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (diff)
parentdaa4f5213f726b22846859f2f12d06889e9bdc9b (diff)
downloadvolse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.gz
volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.bz2
volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: zrl's when visiting public photos at the source site doco cleanup turn "follow" into a function add hometown to profiles bug #439 - remove web port number from notification email "from" address webfinger profile linker "howlong" added to marital status. fewer "bob smith to bob smith via wall-to-wall". [quote=somebody] was appearing as an extended spoiler tag. * master:
Diffstat (limited to 'view/de/messages.po')
0 files changed, 0 insertions, 0 deletions