]> git.wh0rd.org Git - tt-rss.git/commit
Merge branch 'master' into hookhead
authorjustauser <justausr@hotmail.com>
Sun, 7 Jul 2013 17:57:06 +0000 (13:57 -0400)
committerjustauser <justausr@hotmail.com>
Sun, 7 Jul 2013 17:57:06 +0000 (13:57 -0400)
commit3b96b0ed7cf8d960dd3ec2208ad8addb584bc1c9
treed83db38f58511d5648b6bd665ab3760d74e73875
parentef3a8db1cc83e02a9f8933869d19f299f2abe72a
parente4e9ac1fc288d6715f6419cd4c8a44386362ecf0
Merge branch 'master' into hookhead

Conflicts:
include/functions.php

changes for conflicts with master
classes/api.php
classes/feeds.php
classes/handler/public.php
include/functions.php