34a4951e28
Conflicts: Gemfile config/locales/de.yml config/locales/en.yml |
||
---|---|---|
.. | ||
application.js | ||
bootstrap.js.coffee | ||
list.delay.js | ||
list.reset.js | ||
list.unlist.js | ||
ordering.js | ||
stupidtable.js |
34a4951e28
Conflicts: Gemfile config/locales/de.yml config/locales/en.yml |
||
---|---|---|
.. | ||
application.js | ||
bootstrap.js.coffee | ||
list.delay.js | ||
list.reset.js | ||
list.unlist.js | ||
ordering.js | ||
stupidtable.js |