Raymond Wanyoike a9b401b0f5 Merge branch 'v2.0.0' into clean-blog-theme ... # Conflicts: # alchemy/static/css/style.css		2016-11-06 23:39:48 +03:00
..
static	Merge branch 'v2.0.0' into clean-blog-theme	2016-11-06 23:39:48 +03:00
templates	Bring consistency to templates, update structure to use new base	2016-11-06 22:34:37 +03:00