Files
sx-fc/app/controllers/application_controller.rb
Min Zeya Phyo 1ea9125f80 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb
2017-06-26 21:57:55 +06:30

1.0 KiB