Commit ec221972 authored 15 years ago by brad kittenbrink

Fixups for conflicts that got dropped in the changeset 486d51877332 merge of...

Fixups for conflicts that got dropped in the changeset 486d51877332 merge of viewer-2.0.0-3 with login-api.
Mostly code that had been modified in viewer-2.0.0-3 that had been moved elsewhere in login-api.

parent 4fcc4063

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 5 additions and 5 deletions

Please register or to comment

Silent mode is enabled

Fixups for conflicts that got dropped in the changeset 486d51877332 merge of...