Changeset 596 for team

Show
Ignore:
Timestamp:
09/08/07 16:00:21 (15 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/import_blogs
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • team/michiel/import_blogs

    • Property svnmerge-integrated changed from /trunk:1-593 to /trunk:1-595

  • team/michiel/import_blogs/common/rss.php

    r573 r596  
    4444$url = $proto."://".$_SERVER["SERVER_NAME"].(substr($_SERVER["REQUEST_URI"], 0, strpos($_SERVER["REQUEST_URI"], "common/"))); 
    4545 
    46 /* most fiids have limit of 1 month */ 
     46/* most feeds have limit of 1 month */ 
    4747$max_time = mktime(0, 0, 0, date("m"), date("d")+1, date("Y")); 
    4848