# Conflicts:
#	resources/views/post/newsfeed.blade.php

# By Nitipat
# Via Nitipat
* feature/ui_clean:
  max width
  center feed

Conflicts:
	resources/views/post/newsfeed.blade.php

# By Nutchalum (2) and others
# Via Nutchalum (4) and kamonkwun-mbp (2)
* develop:
  like
  comment in newsfeed
  return like
  Fix like
  fix post

# Conflicts:
#	public/css/newsfeed.css
#	public/js/comment-post.js

Conflicts:
	app/Http/routes.php

# By kamolpop
# Via kamolpop
* develop:
  post picture

Conflicts:
	resources/views/post/newsfeed.blade.php

* feature/upload_pic:
  ok

Conflicts:
	app/Http/Controllers/PostController.php