Merge conflicts: ms.coffee

Browse source

...

This commit is contained in:

Glen De Cauwsemaecker 2014-04-03 17:38:46 +02:00

parent 7690210eff eaa9443969

commit a2ac89094a

1 changed files with 601 additions and 600 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1201

app/locale/ms.coffee

View file

File diff suppressed because it is too large Load diff