From 7a1ac27609b654e495c9a88a54083dfef8f6de66 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 19 Jul 2016 16:15:46 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=82=E5=8A=A0=E3=83=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=A0=E3=81=AE=E9=81=B8=E6=8A=9E=E3=81=AB=E5=85=A8=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E3=82=92=E8=BF=BD=E5=8A=A0=20https://github.com/NetCo?=
 =?UTF-8?q?mmons3/UserManager/issues/13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Locale/jpn/LC_MESSAGES/net_commons.po | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Locale/jpn/LC_MESSAGES/net_commons.po b/Locale/jpn/LC_MESSAGES/net_commons.po
index 4617d7a4..9be4135e 100644
--- a/Locale/jpn/LC_MESSAGES/net_commons.po
+++ b/Locale/jpn/LC_MESSAGES/net_commons.po
@@ -476,6 +476,9 @@ msgstr "一覧へ"
 msgid "Sort"
 msgstr "並び替え"
 
+msgid "All select"
+msgstr "全選択"
+
 
 #
 #: ラベル

From d324320f68d21d6150c16690ef1eebc372b38ed0 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 19 Jul 2016 16:28:58 +0900
Subject: [PATCH 2/2] =?UTF-8?q?favicon=E3=81=AE=E8=BF=BD=E5=8A=A0=20https:?=
 =?UTF-8?q?//github.com/NetCommons3/NetCommons3/issues/312?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Layouts/default.ctp |   1 +
 webroot/empty            |   0
 webroot/favicon.ico      | Bin 0 -> 160 bytes
 3 files changed, 1 insertion(+)
 delete mode 100644 webroot/empty
 create mode 100644 webroot/favicon.ico

diff --git a/View/Layouts/default.ctp b/View/Layouts/default.ctp
index 4966ae9d..328590fd 100644
--- a/View/Layouts/default.ctp
+++ b/View/Layouts/default.ctp
@@ -19,6 +19,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 		<title><?php echo (isset($pageTitle) ? h($pageTitle) : ''); ?></title>
 
 		<?php
+			echo $this->html->meta('icon', '/net_commons/favicon.ico');
 			echo $this->fetch('meta');
 
 			echo $this->element('NetCommons.common_css');
diff --git a/webroot/empty b/webroot/empty
deleted file mode 100644
index e69de29b..00000000
diff --git a/webroot/favicon.ico b/webroot/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bb13e0262b91f1715b75c0e2f79792960fbb4a80
GIT binary patch
literal 160
zcmZ?wbhEHb6krfw*v!E2{{8!l7cYMO`t|(z^Xu2IfBN+4{Q2{HdV2o<|IdI8DE?#t
z3+sSLkQodtz6NtVv!`mj-mCsU@?qngii|@JYmO+iC>u$X*d9oClVD~z!!jq0{R9J#
sV~eNrZIh`R)1U2}BQ+;HgHQ2k+G-VEi#574&S!jaOv?0U5@fIj0OV~tH~;_u

literal 0
HcmV?d00001