Merge branch 'master' of /var/www/trunk

Conflicts:

	actions/facebookhome.php
	actions/facebooksettings.php
This commit is contained in:
Evan Prodromou
2009-01-19 13:35:17 +00:00
11 changed files with 2058 additions and 262 deletions

18
js/facebookapp.js Normal file
View File

@@ -0,0 +1,18 @@
/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/