GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' into 0.9.x

Browse Source 
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
This commit is contained in:
Evan Prodromou
2009-08-27 11:16:45 -07:00
parent f1fda6c050 82b0927f58
commit 5d09b6b3f0
432 changed files with 3590 additions and 3509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/util.js
View File

@@ -1,6 +1,6 @@
/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
* StatusNet - a distributed open-source microblogging tool
* Copyright (C) 2008, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by