Skip to content

Commit

Permalink
Merge branch 'release/6.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jansiegel committed Nov 14, 2018
2 parents c57d1c6 + febc32a commit 4a4833e
Show file tree
Hide file tree
Showing 99 changed files with 7,984 additions and 5,223 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@
"core-js/*",
"regenerator-runtime/runtime",
"./common",
"./jasmine",
"./../bootstrap",
"./helpers/custom-matchers",
"./asciiTable",
"./MemoryLeakTest",
"../MemoryLeakTest"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you are looking for an extended version, try out [Handsontable Pro](//github.

**We are looking for Contributors who would like to help us with translations. [Learn more](https://github.com/handsontable/handsontable/issues/4696)**
<br/>
Most wanted languages: Danish, Korean, Portuguese, Spanish and Swedish.
Most wanted languages: Danish, Portuguese, Spanish and Swedish.

---

Expand Down Expand Up @@ -112,7 +112,7 @@ var hot = new Handsontable(container, {
- Internationalization
- Non-contiguous selection

[See a comparison table](//docs.handsontable.com/tutorial-features.html)
[See a comparison table](//handsontable.com/docs/tutorial-features.html)

<br/>

Expand All @@ -126,8 +126,8 @@ var hot = new Handsontable(container, {
<br/>

### Resources
- [API Reference](//docs.handsontable.com/Core.html)
- [Compatibility](//docs.handsontable.com/tutorial-compatibility.html)
- [API Reference](//handsontable.com/docs/Core.html)
- [Compatibility](//handsontable.com/docs/tutorial-compatibility.html)
- [Change log](//github.com/handsontable/handsontable/releases)
- [Roadmap](//trello.com/b/PztR4hpj)
- [Newsroom](//twitter.com/handsontable)
Expand Down
4 changes: 2 additions & 2 deletions dist/handsontable.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/handsontable.full.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* Version: 6.1.1
* Release date: 23/10/2018 (built at 22/10/2018 12:07:26)
* Version: 6.2.0
* Release date: 14/11/2018 (built at 07/11/2018 13:01:49)
*/
/**
* Fix for bootstrap styles
Expand Down
Loading

0 comments on commit 4a4833e

Please sign in to comment.