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 |
|