Ludovic Marcotte 9b0a2c5fae Merge branch 'master' into feature/addMissingStrings2 ...

Conflicts:
	UI/AdministrationUI/English.lproj/Localizable.strings
	UI/PreferencesUI/English.lproj/Localizable.strings
	UI/Templates/PreferencesUI/UIxFilterEditor.wox

2015-12-03 11:16:17 -05:00

..

UIxAccountEditor.wox

(fix) replace .md-actions with md-dialog-actions

2015-11-27 13:00:39 -05:00

UIxAdditionalPreferences.wox

Monotone-Parent: 40f77d0f9e67b4e3fd56c1a7eb0b966cabaca41f

2008-08-21 02:36:04 +00:00

UIxFilterEditor.wox

Merge branch 'master' into feature/addMissingStrings2

2015-12-03 11:16:17 -05:00

UIxPreferences.wox

(feat) you can now select your alternate avatar

2015-11-27 16:04:12 -05:00