Harry Bomrah a72d5fbb48 change in parser and new template for 4.5 ... Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb		2014-05-02 18:26:21 +08:00
..
affix.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
alert.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
button.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
carousel.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
collapse.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
dropdown.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
modal.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
popover.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
scrollspy.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
tab.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
tooltip.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
transition.js	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00