Merge branch 'testing' into 0.9.x

This commit is contained in:
Evan Prodromou 2010-09-02 23:41:56 -04:00
commit edf45ad647

4
README
View File

@ -73,8 +73,8 @@ License along with this program, in the file "COPYING". If not, see
modifications, *YOU MAY NOT INSTALL STATUSNET*. modifications, *YOU MAY NOT INSTALL STATUSNET*.
CSS and images in the /theme/ directory are available under the CSS and images in the /theme/ directory are available under the
Creative Commons Attribution 3.0 Unported license. See Creative Commons Attribution 3.0 Unported license, with attribution to
http://creativecommons.org/licenses/by/3.0/ for details. "StatusNet". See http://creativecommons.org/licenses/by/3.0/ for details.
Our understanding and intention is that if you add your own theme that Our understanding and intention is that if you add your own theme that
uses only CSS and images, those files are not subject to the copyleft uses only CSS and images, those files are not subject to the copyleft