Skip to content

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscant committed Jul 18, 2019
2 parents e6d308a + e1506b4 commit ab8adcf
Show file tree
Hide file tree
Showing 7 changed files with 720 additions and 629 deletions.
2 changes: 1 addition & 1 deletion dev/webpack.appfd.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module.exports = new Config().extend({
}),
// CC new FaviconsPlugin('images/user_logo.png'),
new webpack.DefinePlugin({
APP_VERSION: JSON.stringify('1.4.15, 15 July 2019'),
APP_VERSION: JSON.stringify('1.4.16, 18 July 2019'),
// CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
FACEBOOK_APPID: JSON.stringify('134980666550322'),
FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),
Expand Down
Loading

0 comments on commit ab8adcf

Please sign in to comment.