Commit graph

7 commits

Author SHA1 Message Date
d9b23add41 Merge branch 'master' into myAutoBlog
Conflicts:
	0.3/index.php
2013-04-08 16:16:16 +02:00
9b96ceed08 [add] div#contentVignette for center .vignette block 2013-04-08 15:50:50 +02:00
8ac6108585 Merge branch 'master' into myAutoBlog 2013-04-08 15:29:10 +02:00
253a7690ef [add] option for use thumbshot 2013-04-08 15:25:21 +02:00
101922a5c3 [add] user.css 2013-04-08 14:42:37 +02:00
Apache
14426a85c7 rm resources/rss.xml 2013-04-08 14:33:15 +02:00
ArthurHoaro
5da0e87beb resources folder added (relatad to #8)
Warning: RSS file will be reset
2013-04-08 13:13:25 +02:00