directory attributes changed
directory changed
directories/index/ directories/new version1
changed
modify home view
modify user model
Merge branch 'develop' of https://github.com/kkammo/yonseitree into develop
modify merge conflict
solve merge conflict
solve merge conflict
modify user schema
Merge commit 'ba14a43c984151706cf69e4a859a86b4023f2531' into develop

Conflicts:
	app/controllers/directories_controller.rb