Skip to content

Commit 12fa5f5

Browse files
authored
Update README.md
Added the final merge information.
1 parent fe33178 commit 12fa5f5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

blockly/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ All other changes and fixes have been submitted to the original Blockly reposito
2525

2626
This fork gets frequent upstream pulls to maintain it up to date.
2727

28+
MEMO: The final merge is 421fdf8fea2938d562107373da68623f8e1cba6b (2016/5/23)
29+
> blockly upstream up to commit 493fa91bdc7389e5cf173b74f59c297125718b53
30+
> 21st May 2016 "Merge pull request #376 from google/revert-371-proxy"
31+
> https://github.com/google/blockly/commit/493fa91bdc7389e5cf173b74f59c297125718b53
2832
2933
## Git configuration
3034

0 commit comments

Comments
 (0)