Merge branch 'kk-arab-autonym' of github.com:amire80/jquery.uls into amire80-kk-arab-autonym

Browse Source

Conflicts:
	src/jquery.uls.data.js

Change-Id: I56e485c5fc3a8d4eef9d44196d9fa4aa450e4b29

...

This commit is contained in:

Santhosh Thottingal

2013-10-23 19:06:46 +05:30

parent a48123ef1e d8fdcd4baf

commit a22781ff89

2 changed files with 2 additions and 2 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

2

src/jquery.uls.data.js

File diff suppressed because one or more lines are too long