Permalink
Browse files

Sync develop with master

  • Loading branch information...
Evan Herman
Evan Herman committed Dec 14, 2017
1 parent da2d277 commit 4c6247432b44cd58bf16510cc5be9aeaf5ee0dbb
Showing with 9 additions and 8 deletions.
  1. +1 −1 .dev/sass/style.scss
  2. +1 −0 .gitignore
  3. +1 −1 functions.php
  4. +1 −1 package-lock.json
  5. +1 −1 package.json
  6. +1 −1 readme.md
  7. +1 −1 readme.txt
  8. +1 −1 style-rtl.css
  9. +1 −1 style.css
View
@@ -4,7 +4,7 @@
* Author: GoDaddy
* Author URI: https://www.godaddy.com/
* Description: Velux is a Primer child theme with a clean, professional, and upscale design.
* Version: 1.1.0
* Version: 1.1.1
* License: GPL-2.0
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
* Text Domain: velux
View
@@ -1,5 +1,6 @@
node_modules
/.DS_Store
build/
/templates/parts/.DS_Store
/templates/.DS_Store
/assets/.DS_Store
View
@@ -7,7 +7,7 @@
*
* @var string
*/
define( 'PRIMER_CHILD_VERSION', '1.1.0' );
define( 'PRIMER_CHILD_VERSION', '1.1.1' );
/**
* Move some elements around.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -2,7 +2,7 @@
"name": "velux",
"title": "Velux",
"description": "Velux is a Primer child theme with a clean, professional, and upscale design.",
"version": "1.1.0",
"version": "1.1.1",
"author": "GoDaddy",
"license": "GPL-2.0",
"repository": "godaddy/wp-velux-theme",
View
@@ -3,7 +3,7 @@
**Tags:** [custom-background](https://wordpress.org/themes/tags/custom-background/), [custom-colors](https://wordpress.org/themes/tags/custom-colors/), [custom-header](https://wordpress.org/themes/tags/custom-header/), [custom-menu](https://wordpress.org/themes/tags/custom-menu/), [editor-style](https://wordpress.org/themes/tags/editor-style/), [featured-images](https://wordpress.org/themes/tags/featured-images/), [fixed-layout](https://wordpress.org/themes/tags/fixed-layout/), [flexible-header](https://wordpress.org/themes/tags/flexible-header/), [fluid-layout](https://wordpress.org/themes/tags/fluid-layout/), [left-sidebar](https://wordpress.org/themes/tags/left-sidebar/), [light](https://wordpress.org/themes/tags/light/), [one-column](https://wordpress.org/themes/tags/one-column/), [responsive-layout](https://wordpress.org/themes/tags/responsive-layout/), [right-sidebar](https://wordpress.org/themes/tags/right-sidebar/), [rtl-language-support](https://wordpress.org/themes/tags/rtl-language-support/), [sticky-post](https://wordpress.org/themes/tags/sticky-post/), [threaded-comments](https://wordpress.org/themes/tags/threaded-comments/), [three-columns](https://wordpress.org/themes/tags/three-columns/), [translation-ready](https://wordpress.org/themes/tags/translation-ready/), [two-columns](https://wordpress.org/themes/tags/two-columns/)
**Requires at least:** 4.4
**Tested up to:** 4.9
**Stable tag:** 1.1.0
**Stable tag:** 1.1.1
**License:** GPL-2.0
**License URI:** https://www.gnu.org/licenses/gpl-2.0.html
View
@@ -3,7 +3,7 @@ Contributors: godaddy, fjarrett, jonathanbardo, eherman24
Tags: custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, fixed-layout, flexible-header, fluid-layout, left-sidebar, light, one-column, responsive-layout, right-sidebar, rtl-language-support, sticky-post, threaded-comments, three-columns, translation-ready, two-columns
Requires at least: 4.4
Tested up to: 4.9
Stable tag: 1.1.0
Stable tag: 1.1.1
License: GPL-2.0
License URI: https://www.gnu.org/licenses/gpl-2.0.html
View
@@ -4,7 +4,7 @@
* Author: GoDaddy
* Author URI: https://www.godaddy.com/
* Description: Velux is a Primer child theme with a clean, professional, and upscale design.
* Version: 1.1.0
* Version: 1.1.1
* License: GPL-2.0
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
* Text Domain: velux
View
@@ -4,7 +4,7 @@
* Author: GoDaddy
* Author URI: https://www.godaddy.com/
* Description: Velux is a Primer child theme with a clean, professional, and upscale design.
* Version: 1.1.0
* Version: 1.1.1
* License: GPL-2.0
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
* Text Domain: velux

0 comments on commit 4c62474

Please sign in to comment.