8000 Merge pull request #5075 from activeadmin/1.1.0 · ybart/activeadmin@6ada3cc · GitHub
[go: up one dir, main page]
Skip to content

Commit 6ada3cc

Browse files
javierjuliojavierjulio
authored
Merge pull request activeadmin#5075 from activeadmin/1.1.0
prepare for release 1.1.0
2 parents 6eaef51 + de78841 commit 6ada3cc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## Master (unreleased)
3+
## ## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
44

55
### Bug Fixes
66

@@ -198,6 +198,7 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
198198
[#5060]: https://github.com/activeadmin/activeadmin/pull/5060
199199
[#5069]: https://github.com/activeadmin/activeadmin/pull/5069
200200
[#5088]: https://github.com/activeadmin/activeadmin/pull/5088
201+
[#5093]: https://github.com/activeadmin/activeadmin/pull/5093
201202

202203
[@ajw725]: https://github.com/ajw725
203204
[@bolshakov]: https://github.com/bolshakov

‎lib/active_admin/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ActiveAdmin
2-
VERSION = '1.0.0'
2+
VERSION = '1.1.0'
33
end

0 commit comments

Comments
 (0)
0