diff options
author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /doc/html/chanview_8php.html | |
parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'doc/html/chanview_8php.html')
-rw-r--r-- | doc/html/chanview_8php.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/html/chanview_8php.html b/doc/html/chanview_8php.html index dafe62257..362affb17 100644 --- a/doc/html/chanview_8php.html +++ b/doc/html/chanview_8php.html @@ -28,7 +28,7 @@ <table cellspacing="0" cellpadding="0"> <tbody> <tr style="height: 56px;"> - <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td> <td style="padding-left: 0.5em;"> <div id="projectname">The Red Matrix </div> |