app/controllers/posts_controller.rb · 03380516f1939a1cdd9b29616340f5b306091b9e · facil / parlote-facil · GitLab

oct. 25, 2011
3ce0806c
Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login · 3ce0806c
Pistos a rédigé oct. 25, 2011
```
Conflicts:
	app/controllers/comments_controller.rb
	app/helpers/comments_helper.rb
```
3ce0806c
Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login
Pistos a rédigé oct. 25, 2011
```
Conflicts:
	app/controllers/comments_controller.rb
	app/helpers/comments_helper.rb
```