nodebb/public/templates
psychobunny 73d637096c Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/account.tpl
	public/templates/accountposts.tpl
	public/templates/favourites.tpl
	public/templates/search.tpl
..
.gitignore added gitignore to public/templates dir
account.tpl post summary change
accountposts.tpl post summary change
favourites.tpl post summary change
search.tpl post summary change