| Author |
Committer |
Branch |
Timestamp |
Parent |
| Marcello Stanisci |
Marcello Stanisci |
master |
2016-02-19 12:18 |
master 6c15480a |
|
|
Changeset |
Merge branch 'master' of ssh://taler.net/var/git/merchant |
| mod - src/frontend/generate_taler_contract.php |
Diff
File |
| add - src/frontend_blog/articles/arabic.jpg |
Diff
File |
| add - src/frontend_blog/articles/belarusian.jpg |
Diff
File |
| add - src/frontend_blog/articles/bulgarian.jpg |
Diff
File |
| add - src/frontend_blog/articles/category.jpg |
Diff
File |
| add - src/frontend_blog/articles/chinese-simplified.jpg |
Diff
File |
| add - src/frontend_blog/articles/chinese-traditional.jpg |
Diff
File |
| add - src/frontend_blog/articles/code.jpg |
Diff
File |
| add - src/frontend_blog/articles/farsi.jpg |
Diff
File |
| rm - src/frontend_blog/articles/fs-essay.html |
Diff
File |
| add - src/frontend_blog/articles/greek.jpg |
Diff
File |
| add - src/frontend_blog/articles/japanese-kana.jpg |
Diff
File |
| add - src/frontend_blog/articles/japanese-kanji.jpg |
Diff
File |
| add - src/frontend_blog/articles/korean.jpg |
Diff
File |
| add - src/frontend_blog/articles/russian.jpg |
Diff
File |
| rm - src/frontend_blog/articles/scrap1.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_1.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_10.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_11.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_12.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_13.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_14.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_15.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_16.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_17.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_18.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_19.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_2.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_20.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_21.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_22.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_23.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_24.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_25.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_26.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_27.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_28.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_29.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_3.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_30.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_31.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_32.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_33.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_34.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_35.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_36.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_37.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_38.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_39.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_4.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_40.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_41.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_42.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_43.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_44.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_45.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_46.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_47.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_48.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_5.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_6.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_7.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_8.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_9.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_U.0.html |
Diff
File |
| mod - src/frontend_blog/articles/scrap1_U.1.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_U.2.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_U.3.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_U.4.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_fot.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_ovr.html |
Diff
File |
| rm - src/frontend_blog/articles/scrap1_top.html |
Diff
File |
| add - src/frontend_blog/articles/serbian-croatian.jpg |
Diff
File |
| add - src/frontend_blog/articles/song-book-jutta-scrunch-crop.jpg |
Diff
File |
| add - src/frontend_blog/articles/tamil.jpg |
Diff
File |
| add - src/frontend_blog/articles/ukrainian.jpg |
Diff
File |
| mod - src/frontend_blog/blog_lib.php |
Diff
File |
| mod - src/frontend_blog/essay_cc-form.html |
Diff
File |
| rm - src/frontend_blog/essay_cc-payment.html |
Diff
File |
| mod - src/frontend_blog/essay_contract.php |
Diff
File |
| mod - src/frontend_blog/essay_fulfillment.php |
Diff
File |
| mod - src/frontend_blog/index.html |
Diff
File |
