Revert "Remove undeployed version of Spiel"
This reverts commit 2f6edbda3a
.
This commit is contained in:
parent
4424e2ec77
commit
78b35e2974
2 changed files with 7 additions and 0 deletions
|
@ -12,10 +12,13 @@ Spiel is a game magazine theme.
|
|||
|
||||
== Changelog ==
|
||||
|
||||
<<<<<<< HEAD
|
||||
= 1.0.1 =
|
||||
* Remove undeployed version of Spiel
|
||||
* Spiel: re-add and fix translator comment
|
||||
|
||||
=======
|
||||
>>>>>>> parent of 2f6edbda3 (Remove undeployed version of Spiel)
|
||||
= 1.0.0 =
|
||||
* Initial release
|
||||
|
||||
|
|
|
@ -7,7 +7,11 @@ Description: Spiel is a game magazine theme.
|
|||
Requires at least: 6.0
|
||||
Tested up to: 6.4
|
||||
Requires PHP: 5.7
|
||||
<<<<<<< HEAD
|
||||
Version: 1.0.1
|
||||
=======
|
||||
Version: 1.0.0
|
||||
>>>>>>> parent of 2f6edbda3 (Remove undeployed version of Spiel)
|
||||
License: GNU General Public License v2 or later
|
||||
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
||||
Text Domain: spiel
|
||||
|
|
Loading…
Reference in a new issue