Quoting Staś Małolepszy (2014-09-15 22:25:02) > Quoting Staś Małolepszy (2014-09-09 15:27:27) > > I'd like to gather feedback about this plan this week and implement > > the above change on Monday, September 15. > > I got back home later than expected and I'm already quite tired. > I didn't hear any negative feedback about this change; I'll implement > it tomorrow morning.
The great merge is now complete! As of this morning we have the following two branches: - https://github.com/l20n/l20n.js/tree/v1.0.x (previously master) - https://github.com/l20n/l20n.js/tree/master (previously gaia) The gaia branch is no more. To update your clones, check out the master branch locally and pull from upstream. If you have local branches based on gaia, you should be able to rebase them cleanly with `git rebase master`. If you have local branches based on old master, you should be able to rebase them with `git rebase master --onto v1.0.x`. (Check out v1.0.x first.) I also tagged and released 1.0.1 and 2.0.1 from their respective branches and I published 1.0.1 on npm and bower. Happy hacking! -stas -- @stas _______________________________________________ tools-l10n mailing list [email protected] https://lists.mozilla.org/listinfo/tools-l10n
