Athou d1d41f6449 Merge branch 'patch-1' of https://github.com/ekovi/commafeed into ekovi-patch-1 ...

Conflicts:
	src/main/resources/i18n/cs.properties

2013-07-10 06:15:43 +02:00

..

main

Merge branch 'patch-1' of https://github.com/ekovi/commafeed into ekovi-patch-1

2013-07-10 06:15:43 +02:00

test

don't check the query params for feedburner

2013-07-06 06:42:36 +02:00