Merge lp://staging/~guiona/bilboplanet/665159 into lp://staging/~greg-theclimber/bilboplanet/testing
Proposed by
Guiona
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 104 | ||||
Proposed branch: | lp://staging/~guiona/bilboplanet/665159 | ||||
Merge into: | lp://staging/~greg-theclimber/bilboplanet/testing | ||||
Diff against target: |
6647 lines (+1569/-4657) 31 files modified
javascript/fancy.js (+3/-0) javascript/fancybox/fancybox.css (+0/-315) javascript/jquery.easing-1.3.pack.js (+72/-0) javascript/jquery.easing.1.3.js (+0/-205) javascript/jquery.fancybox-1.2.1.js (+0/-547) javascript/jquery.fancybox-1.2.1.pack.js (+0/-9) javascript/jquery.fancybox-1.3.2.pack.js (+46/-0) javascript/links.js (+0/-346) javascript/mobile.js (+0/-8) javascript/smothscroll.js (+0/-144) javascript/votes.js (+0/-32) themes/aragorn/css/jquery.fancybox-1.3.2.css (+359/-0) themes/aragorn/index.tpl (+3/-2) themes/aragorn/js/jquery.easing.1.3.js (+0/-205) themes/aragorn/js/jquery.fancybox-1.2.1.js (+0/-547) themes/aragorn/js/jquery.fancybox-1.2.1.pack.js (+0/-9) themes/gandalf/css/jquery.fancybox-1.3.2.css (+359/-0) themes/gandalf/index.tpl (+3/-1) themes/gandalf/js/jquery.easing.1.3.js (+0/-205) themes/gandalf/js/jquery.fancybox-1.2.1.js (+0/-547) themes/gandalf/js/jquery.fancybox-1.2.1.pack.js (+0/-9) themes/gil-galad/css/jquery.fancybox-1.3.2.css (+359/-0) themes/gil-galad/index.tpl (+3/-2) themes/gil-galad/js/jquery.easing.1.3.js (+0/-205) themes/gil-galad/js/jquery.fancybox-1.2.1.js (+0/-547) themes/gil-galad/js/jquery.fancybox-1.2.1.pack.js (+0/-9) themes/legolas/css/jquery.fancybox-1.3.2.css (+359/-0) themes/legolas/index.tpl (+3/-2) themes/legolas/js/jquery.easing.1.3.js (+0/-205) themes/legolas/js/jquery.fancybox-1.2.1.js (+0/-547) themes/legolas/js/jquery.fancybox-1.2.1.pack.js (+0/-9) |
||||
To merge this branch: | bzr merge lp://staging/~guiona/bilboplanet/665159 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gregoire de Hemptinne | Pending | ||
Review via email:
|
To post a comment you must log in.