]> git.wh0rd.org - tt-rss.git/commit
fix merge conflict with stylesheet tags
authorRichard Beales <rich@richbeales.net>
Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
committerRichard Beales <rich@richbeales.net>
Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
commit77accf45df3072bf0e3fe1e919bb75fc14313119
tree84be283769a6849f4916880739044a163e6f4761
parent04ed8b423abd9046ac4ee6813cf5e98b37aad2a3
parent2d2d08fc41dec694ac0895368eff3eb80a173a5b
fix merge conflict with stylesheet tags
config.php-dist
index.php
prefs.php
register.php