therubyracer
mergemaster
database.yml.sampleを編集
Merge pull request #1 from slp-cem/edit_database.yml.sample

Edit database.yml.sample
Create member model
Gemfileにbcrypt pry-rails annotate quiet_assets better_errors binding_of_coller paranoia を追加 memberパスワードをセキュアに変更
Merge pull request #1 from SLP-KBIT/create_member

memberモデル作成 Gemfile編集
various changes
Merge branch 'master' into create_terminal_top

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
membersテーブルのaccontカラムをaccountカラムに変更
Merge pull request #2 from SLP-KBIT/edit_member

membersテーブルのaccontカラムをaccountカラムに変更
edit list.html.erb, login.html.erb
Merge branch 'master' into create_terminal_top