Commit graph

2 commits

Author SHA1 Message Date
Sacha Greif
f5eb356ac1 adding commenters avatars 2014-12-14 15:15:34 +09:00
Sacha Greif
3e415dce78 Merge branch 'telescope-master-profile-hooks' of github.com:AdmitHub/Telescope into AdmitHub-telescope-master-profile-hooks
Conflicts:
	client/views/posts/modules/post_info.html

Note:
	adapted PR to only keep some of the added features
2014-12-04 12:38:20 +09:00