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

Resolve conflicts after pull from evan

Browse Source 
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
This commit is contained in:
mikec
2008-07-21 09:56:37 -04:00
parent d48609ac51
commit a4fa34cecb
6 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.php
View File

@@ -121,5 +121,7 @@ require_once(INSTALLDIR.'/classes/Confirm_address.php');
require_once(INSTALLDIR.'/classes/Remember_me.php');
require_once(INSTALLDIR.'/classes/Queue_item.php');
require_once(INSTALLDIR.'/classes/Reply.php');
require_once(INSTALLDIR.'/classes/Notice_tag.php');
require_once(INSTALLDIR.'/classes/Sms_carrier.php');
require_once('markdown.php');