the-cdnjs-curator 6c3af3d511 fixed another merge conflict

2014-10-06 21:56:11 -04:00

..

1.0.0

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.0.1

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.0.2

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.0.3

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.1.0

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.2.0

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.2.1

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.2.1a

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.2.2

add angular-route-segment v1.0.0~1.2.2

2014-09-30 20:21:12 +08:00

1.2.3

angular-route-segment 1.2.3

2014-04-14 21:59:11 +02:00

1.2.4

add angular-route-segment v1.2.4

2014-09-30 20:21:29 +08:00

1.3.0

angular-route-segment v1.3.0

2014-05-15 02:47:51 +04:00

1.3.1

add angular-route-segment v1.3.1/1.3.2

2014-09-30 20:19:49 +08:00

1.3.2

add angular-route-segment v1.3.1/1.3.2

2014-09-30 20:19:49 +08:00

1.3.3

angular-route-segment 1.3.3

2014-09-30 20:15:03 +08:00

package.json

fixed another merge conflict

2014-10-06 21:56:11 -04:00