Site updated at 2014-12-17 22:06:24 UTC
Merge branch 'master' of github.com:Tichy/tichy.github.io

Conflicts:
	blog/categories/anarchia/atom.xml
	blog/categories/anarchia/index.html
	blog/categories/anime/atom.xml
	blog/categories/anime/index.html
	blog/categories/antispecismo/atom.xml
	blog/categories/antispecismo/index.html
	blog/categories/arch/atom.xml
	blog/categories/arch/index.html
	blog/categories/arte/atom.xml
	blog/categories/arte/index.html
	blog/categories/censura/atom.xml
	blog/categories/censura/index.html
	blog/categories/cibernetica/atom.xml
	blog/categories/cibernetica/index.html
	blog/categories/controculture/atom.xml
	blog/categories/controculture/index.html
	blog/categories/evoluzione/atom.xml
	blog/categories/evoluzione/index.html
	blog/categories/fantascienza/atom.xml
	blog/categories/fantascienza/index.html
	blog/categories/film/atom.xml
	blog/categories/film/index.html
	blog/categories/filosofia/atom.xml
	blog/categories/filosofia/index.html
	blog/categories/fisica/atom.xml
	blog/categories/fisica/index.html
	blog/categories/foto/atom.xml
	blog/categories/foto/index.html
	blog/categories/gnu-linux/atom.xml
	blog/categories/gnu-linux/index.html
	blog/categories/guide/atom.xml
	blog/categories/guide/index.html
	blog/categories/intelligenza-artificiale/atom.xml
	blog/categories/intelligenza-artificiale/index.html
	blog/categories/liberta/atom.xml
	blog/categories/liberta/index.html
	blog/categories/libri/atom.xml
	blog/categories/libri/index.html
	blog/categories/musica/atom.xml
	blog/categories/musica/index.html
	blog/categories/nonsense/atom.xml
	blog/categories/nonsense/index.html
	blog/categories/orrore/atom.xml
	blog/categories/orrore/index.html
	blog/categories/politica/atom.xml
	blog/categories/politica/index.html
	blog/categories/privacy/atom.xml
	blog/categories/privacy/index.html
	blog/categories/recensioni/atom.xml
	blog/categories/recensioni/index.html
	blog/categories/religione/atom.xml
	blog/categories/religione/index.html
	blog/categories/rete/atom.xml
	blog/categories/rete/index.html
	blog/categories/robot/atom.xml
	blog/categories/robot/index.html
	blog/categories/scienza/atom.xml
	blog/categories/scienza/index.html
	blog/categories/sicurezza/atom.xml
	blog/categories/sicurezza/index.html
	blog/categories/software-libero/atom.xml
	blog/categories/software-libero/index.html
	blog/categories/suckless/atom.xml
	blog/categories/suckless/index.html
	blog/categories/sysadmin/atom.xml
	blog/categories/sysadmin/index.html
	blog/categories/tecnologia/atom.xml
	blog/categories/tecnologia/index.html
	blog/categories/thriller/atom.xml
	blog/categories/thriller/index.html
	blog/categories/utopie/atom.xml
	blog/categories/utopie/index.html
	blog/categories/veg/atom.xml
	blog/categories/veg/index.html
	sitemap.xml
	stylesheets/screen.css

Conflitti durante rake deploy
Site updated at 2014-12-17 22:30:00 UTC