]> git.wh0rd.org Git - tt-rss.git/commit
Merge branch 'master' into patch-1
authorArt4 <art4@wlabs.de>
Thu, 19 Feb 2015 22:17:43 +0000 (23:17 +0100)
committerArt4 <art4@wlabs.de>
Thu, 19 Feb 2015 22:17:43 +0000 (23:17 +0100)
commitd9c042c4c536f1afbf206aeea09b0b127b7b6418
tree9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4
parentcf42b79120290ee5866136a0c4656e6999f06045
parent4ca621a36016de1fbb5447e1c1de0b607ba94a7c
Merge branch 'master' into patch-1

Conflicts:
locale/de_DE/LC_MESSAGES/messages.po