Oct 26, 2016 - Merge lp:~ltrager/maas/lp1636858_2.0 into lp:maas/trunk .... Text conflict in src/maasserver/templates/maasserver/base.html Text conflict in ...... 1154, +# The sequence from which the decimal form of node system IDs should be ...... dd{color:#333;margin-left:0}dl dt,dl dd{display:inline-block;float:left ...