summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2013-06-03 15:30:10 -0500
committerDolph Mathews <dolph.mathews@gmail.com>2013-06-03 15:41:42 -0500
commit2ff3ddd356d599677bfc2a1ad08009b2226357eb (patch)
tree7ce7e43c6f807a2c0d4eda35605818ebf1826f20 /doc/source
parentcd349711bc6210bf35952c5f71bb92ab7676bd2d (diff)
Ignore conflict on v2 auto role assignment (bug 1161963)
Change-Id: I10581a39325b4fcdb997ad704c3ee0de494b32e0
Diffstat (limited to 'doc/source')
0 files changed, 0 insertions, 0 deletions