Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 3.x #1995

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Dev 3.x #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
66e8f00
Merge branch 'dev-master' into dev-3.x
okuryu Sep 29, 2014
171d941
Merge branch 'dev-master' into dev-3.x
okuryu Sep 29, 2014
cd295f0
Merge branch 'dev-master' into dev-3.x
okuryu Sep 29, 2014
f63b7f5
Merge branch 'dev-master' into dev-3.x
okuryu Sep 29, 2014
baccf40
Merge branch 'dev-master' into dev-3.x
tripp Sep 29, 2014
6d2d564
Merge branch 'dev-master' into dev-3.x
tripp Sep 29, 2014
3ebc16d
Major pre version bump.
tripp Sep 29, 2014
3a12afc
Merge branch 'dev-master' into dev-3.x
okuryu Oct 1, 2014
e5aa0fc
Bump metadata JSON to 3.19.0-pre
okuryu Oct 1, 2014
e9d3dbb
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
tripp Oct 20, 2014
0b422d7
Merge branch 'dev-master' into dev-3.x
tripp Oct 21, 2014
0c60a68
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x
tripp Oct 21, 2014
b5ca75d
Resolve version diffs
tripp Oct 22, 2014
c0858c2
Merge branch 'dev-master' into dev-3.x
tripp Oct 22, 2014
a2265e0
Major pre version bump.
tripp Oct 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yui",
"version": "3.18.2-pre",
"version": "3.19.0-pre",
"main": "build/yui/yui.js",
"devDependencies": {
"pure": "0.4.2"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yui",
"version": "3.18.2-pre",
"version": "3.19.0-pre",
"description": "YUI 3 Source",
"author": "Dav Glass <[email protected]>",
"bugs": { "url" : "https://github.com/yui/yui3/issues" },
Expand Down