Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

author yasushiito <yas@pen-chan.jp>

Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)

committer yasushiito <yas@pen-chan.jp>

Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
author yasushiito <yas@pen-chan.jp>
Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
committer yasushiito <yas@pen-chan.jp>
Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
diff --cc app/assets/javascripts/manifest/work/controllers.js.coffee.erb
Simple merge
diff --cc app/assets/javascripts/manifest/work/list_groups.js.coffee.erb
Simple merge
diff --cc public/local_manifest.json
Simple merge
diff --cc public/manifest.json
Simple merge
author	yasushiito <yas@pen-chan.jp>
	Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
committer	yasushiito <yas@pen-chan.jp>
	Fri, 30 May 2014 09:51:57 +0000 (18:51 +0900)
		1	2
app/assets/javascripts/manifest/work/controllers.js.coffee.erb	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/javascripts/manifest/work/list_groups.js.coffee.erb	patch \|	diff1 \|	diff2 \|	blob \| history
public/local_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history
public/manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history