Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/3.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Oct 16, 2019
2 parents 11d8d6b + 8ad861a commit 43b08ce
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 3.1.2 - TBD
## 3.1.2 - 2019-10-16

### Added

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
Copyright (c) 2005-2019, Zend Technologies USA, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,20 @@

zend-xml2json provides functionality for converting XML structures to JSON.

- File issues at https://github.com/zendframework/zend-xml2json/issues
- Documentation is at https://docs.zendframework.com/zend-xml2json/
## Installation

Run the following to install this library:

```bash
$ composer require zendframework/zend-xml2json
```

## Documentation

Browse the documentation online at https://docs.zendframework.com/zend-xml2json/

## Support

* [Issues](https://github.com/zendframework/zend-xml2json/issues/)
* [Chat](https://zendframework-slack.herokuapp.com/)
* [Forum](https://discourse.zendframework.com/)
10 changes: 0 additions & 10 deletions docs/book/index.html

This file was deleted.

7 changes: 3 additions & 4 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
docs_dir: docs/book
site_dir: docs/html
pages:
- index.md
nav:
- Home: index.md
- Usage: usage.md
site_name: zend-xml2json
site_description: Zend\Xml2Json
site_description: "Convert XML documents to JSON"
repo_url: 'https://github.com/zendframework/zend-xml2json'
copyright: 'Copyright (c) 2005-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'

0 comments on commit 43b08ce

Please sign in to comment.