1
1
aa
Merge remote-tracking branch 'remotes/xiaoyu/master'

Conflicts:
	app/assets/javascripts/pannonia/js/files/functions_blank.js
	app/views/categories/_new_sub.erb
	app/views/categories/show.html.erb
	db/schema.rb
1
icon
Merge pull request #6 from satzcoal/master

merge1027