Commit graph

3 commits

Author SHA1 Message Date
Knah Tsaeb 3e3861ee87 Merge branch 'master' into myAutoBlog
Conflicts:
	.gitignore
	docs/docs.txt
	functions.php
	index.php
	xsaf3.php
2013-04-30 12:04:03 +02:00
Arthur d47dd18f3a fixes #20 (foldername) and begin change to rss.json
WARNING: You really need to take a look at https://github.com/mitsukarenai/Projet-Autoblog/wiki/Mettre-%C3%A0-jour before updating
2013-04-29 22:06:31 +02:00
Mitsukarenai 732c7d5f6c ?? 2013-04-22 12:00:26 +02:00