Commit Graph

1 Commits

Author SHA1 Message Date
Zitao Xiong
62ce9584da Merge remote-tracking branch 'schriftgestalt/master'
* schriftgestalt/master:
  add option to insert NSLocalizedStringFromTableInBundle

Conflicts:
	QuickLocalization/QuickLocalization.m
2015-11-19 02:26:20 -05:00