Jose Lima a5b61d39ce am 92703e62: resolved conflicts for merge of 4882ddfa to master
* commit '92703e62c1dc88a410a32b05c2d44f391c193140':
  Add banner attribute to app manifest
2014-03-13 21:30:03 -07:00
..