Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 4.0

...

[13:27:38 CDT(-0500)] <cindyli> michelled: i imagine merging "authoring-a11y" into "master" will be a big trouble since all our work are currently based on "staging" branch

[14:02:10 CDT(-0500)] <michelled> cindyli: yeah - I'm sure you're right

[14:02:17 CDT(-0500)] <michelled> cindyli: it might be a manual process

[14:10:18 CDT(-0500)] <michelled> cindyli: I think we'll make a patch with a diff between authoring-a11y and staging and then create a new branch off master and apply that patch

[14:10:42 CDT(-0500)] <cindyli> good idea, michelled

[15:08:27 CDT(-0500)] <cindyli> michelled: I submitted a pull request to fix a couple of issues with "leaner options" button - https://github.com/ISKME/OER-Commons/pull/113

[15:08:38 CDT(-0500)] <michelled> thx cindyli

[15:08:42 CDT(-0500)] <cindyli> np

[15:13:09 CDT(-0500)] <michelled> cindyli: I could use your help if you have a moment