Commit Graph

7 Commits

Author SHA1 Message Date
Dysosmus
2003f47c4c Merge branch 'master' of git://github.com/fguillot/miniflux
Conflicts:
	miniflux/templates/read_item.php
	miniflux/templates/unread_items.php
2013-05-18 16:49:07 +02:00
Frederic Guillot
782b952920 Update .gitignore 2013-04-22 22:40:21 -04:00
Frederic Guillot
d63c28b16f Change update scripts name 2013-03-24 10:32:16 -04:00
Frederic Guillot
8e2159986f Add gitignore 2013-03-21 19:59:04 -04:00
Frederic Guillot
4ec4ac3795 Add .htaccess 2013-03-17 19:20:12 -04:00
Frederic Guillot
f035f32967 Big update 2013-03-17 18:16:25 -04:00
Frederic Guillot
e3cf8fe802 first commit 2013-02-17 21:48:21 -05:00