Download as
Browse Code »

Commit 866e53859de67500a259dff9482a7eb3f5506fff

Authored by marcoamarelo
2 parents 5e46dade 62bafdba
Exists in master and in 3 other branches issue274, issue342, issue488

Merge pull request #198 from marcoamarelo/issue192 

Fix pensandoodireito/participacao-sitebase#190
Showing 2 changed files with 7 additions and 0 deletions   Show diff stats
composer.json
  Diff comments   View file @866e538
... ... @@ -50,6 +50,10 @@
50 50 {
51 51 "type": "git",
52 52 "url": "https://github.com/pensandoodireito/debatepublico-tema"
  53 + },
  54 + {
  55 + "type": "git",
  56 + "url": "https://github.com/pensandoodireito/intercambio-tema"
53 57 }
54 58 ],
55 59 "require": {
... ... @@ -61,12 +65,14 @@
61 65 "pensandoodireito/participacao-tema" : "dev-master",
62 66 "pensandoodireito/debatepublico-tema" : "dev-master",
63 67 "pensandoodireito/pensandoodireito-network-functions" : "dev-master",
  68 + "pensandoodireito/intercambio-tema" : "dev-master",
64 69 "pensandoodireito/wp-side-comments" : "dev-master",
65 70 "ethymos/delibera" : "dev-master",
66 71 "wpackagist-plugin/rich-text-tags": "1.7.3",
67 72 "wpackagist-plugin/json-rest-api": "1.1.1",
68 73 "wpackagist-plugin/contact-form-plugin": "3.89",
69 74 "wpackagist-plugin/email-newsletter": "20.12",
  75 + "wpackagist-plugin/social-share-button": "2.1",
70 76 "fancyguy/webroot-installer": "1.0.0",
71 77 "composer/installers": "~1.0"
72 78 },
... ...
scripts/set_tag.sh
  Diff comments   View file @866e538
... ... @@ -9,6 +9,7 @@ fi
9 9 function fetch_settag {
10 10  
11 11 git fetch --all
  12 + git reset HEAD --hard
12 13 git checkout $1
13 14  
14 15 }
... ...