# Conflicts:
#	app/Http/routes.php
#	resources/views/user/profile.blade.php

Conflicts:
	app/Http/routes.php

# Conflicts:
#	app/Http/routes.php

# Conflicts:
#	app/Http/routes.php

# By Nitipat
# Via Nitipat
* develop:
  ok

Conflicts:
	app/Http/routes.php

Conflicts:
	app/Http/Controllers/PostController.php

* newfeed_k:
  แก้บัค
  post comment
  news feed front
  no message