Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
takama committed Dec 5, 2015
2 parents b4f396e + ed165f7 commit 6e89eaf
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 15 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
language: go
go:
- 1.1
- 1.2.2
- 1.3.3
- tip
- 1.4.2
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Igor Dolzhikov
Copyright (c) 2015 Openprovider Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Go Tags

A tags package for use with Go (golang) services

[![Build Status](https://travis-ci.org/takama/tags.png?branch=master)](https://travis-ci.org/takama/tags)
[![GoDoc](https://godoc.org/github.com/takama/tags?status.svg)](https://godoc.org/github.com/takama/tags)
[![Build Status](https://travis-ci.org/openprovider/tags.png?branch=master)](https://travis-ci.org/openprovider/tags)
[![GoDoc](https://godoc.org/github.com/openprovider/tags?status.svg)](https://godoc.org/github.com/openprovider/tags)

### Definitions

Expand Down Expand Up @@ -34,7 +34,7 @@ package main
import (
"fmt"

"github.com/takama/tags"
"github.com/openprovider/tags"
)

// Product is struct with tags
Expand Down Expand Up @@ -85,7 +85,7 @@ func main() {
}
```

## Author
## Authors

[Igor Dolzhikov](https://github.com/takama)

Expand All @@ -94,10 +94,9 @@ func main() {
All the contributors are welcome. If you would like to be the contributor please accept some rules.
- The pull requests will be accepted only in "develop" branch
- All modifications or additions should be tested
- Sorry, I'll not accept code with any dependency, only standard library

Thank you for your understanding!

## License

[MIT Public License](https://github.com/takama/tags/blob/master/LICENSE)
[MIT Public License](https://github.com/openprovider/tags/blob/master/LICENSE)
2 changes: 1 addition & 1 deletion example/example.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"fmt"

"github.com/takama/tags"
"github.com/openprovider/tags"
)

// Product is struct with tags
Expand Down
6 changes: 3 additions & 3 deletions tags.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2014 Igor Dolzhikov. All rights reserved.
// Copyright 2015 Openprovider Authors. All rights reserved.
// Use of this source code is governed by a license
// that can be found in the LICENSE file.

/*
Package tags 0.1.6
Package tags 0.2.0
Definitions:
Expand All @@ -30,7 +30,7 @@ Example:
import (
"fmt"
"github.com/takama/tags"
"github.com/openprovider/tags"
)
// Product is struct with tags
Expand Down
2 changes: 1 addition & 1 deletion tags_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2014 Igor Dolzhikov. All rights reserved.
// Copyright 2015 Openprovider Authors. All rights reserved.
// Use of this source code is governed by a license
// that can be found in the LICENSE file.

Expand Down

0 comments on commit 6e89eaf

Please sign in to comment.