Merge branch 'trunk' into feature/click-edit-files

Conflicts: CHANGELOG.md includes/CMB2_Types.php languages/cmb2.pot tests/test-cmb-types.php
PavelK27 · Feb 15, 2015 · 1afe4bd · 1afe4bd
2 parents 348b440 + deb81a5
commit 1afe4bd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/languages/cmb2.pot b/languages/cmb2.pot
@@ -4,11 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CMB2 2.0.2\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/support/plugin/cmb2\n"
-"POT-Creation-Date: 2015-02-15 04:39:39+00:00\n"
+"POT-Creation-Date: 2015-02-15 04:50:34+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-2-14 4:39+300\n"
+"PO-Revision-Date: 2015-2-14 4:50+300\n"
 "Last-Translator: WebDevStudios [email protected]\n"
 "Language-Team: WebDevStudios [email protected]\n"
 "X-Generator: grunt-wp-i18n 0.4.9\n"