Brad Lassey 18f6511f13 Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander ... DONTBUILD --HG-- extra : amend_source : 32264340bdabf2c66e71967e1f33158b9a5f5cde		2014-03-14 15:19:57 -07:00
..
android	Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander	2014-03-14 15:19:57 -07:00
locales	Bug 745755 - Generate a marketplace bookmark on profile creation. r=wesj	2014-01-29 06:58:46 -08:00