diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /app | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'app')
| -rw-r--r-- | app/bugreport.apd | 1 | ||||
| -rw-r--r-- | app/lang.png | bin | 5163 -> 6559 bytes | |||
| -rw-r--r-- | app/pphoto.png | bin | 10229 -> 5498 bytes | |||
| -rw-r--r-- | app/profile.apd | 4 | ||||
| -rw-r--r-- | app/profile.png | bin | 0 -> 3550 bytes | |||
| -rw-r--r-- | app/randprof.png | bin | 50762 -> 5268 bytes |
6 files changed, 2 insertions, 3 deletions
diff --git a/app/bugreport.apd b/app/bugreport.apd index 412ef62b8..42c31f016 100644 --- a/app/bugreport.apd +++ b/app/bugreport.apd @@ -1,4 +1,3 @@ url: https://github.com/friendica/red/issues -requires: local_user name: Bug Report photo: $baseurl/app/bugreport.png diff --git a/app/lang.png b/app/lang.png Binary files differindex debffd1ae..89a61c26a 100644 --- a/app/lang.png +++ b/app/lang.png diff --git a/app/pphoto.png b/app/pphoto.png Binary files differindex eda371e8b..041ff1e0c 100644 --- a/app/pphoto.png +++ b/app/pphoto.png diff --git a/app/profile.apd b/app/profile.apd index ce52f960b..d2bdf23a7 100644 --- a/app/profile.apd +++ b/app/profile.apd @@ -1,4 +1,4 @@ url: $baseurl/profile/$nick requires: local_user -name: Profile - +name: View profile +photo: $baseurl/app/profile.png diff --git a/app/profile.png b/app/profile.png Binary files differnew file mode 100644 index 000000000..e6e137c82 --- /dev/null +++ b/app/profile.png diff --git a/app/randprof.png b/app/randprof.png Binary files differindex 3280ef8ee..7bb438dcd 100644 --- a/app/randprof.png +++ b/app/randprof.png |
